Commit 1e8413fc authored by Matteo De Carlo's avatar Matteo De Carlo

merge message error

(forgot to save file)
parent 40335715
Pipeline #127 passed with stage
in 1 minute and 26 seconds
......@@ -245,19 +245,11 @@
% Include an abstract of your report
\abstract{
<<<<<<< HEAD
% explain enviroment
Envisioning the development of an evolvable robotic ecosystem called \tol, where robots can evolve both software and hardware, many components still need to be developed.
% explain problem
One of the main missing components is teaching newborn robots to move, not just randomly, but towards a target of choice. The target could be an area to explore, a food source or a mating area.
% explain aim of the project
=======
% explain environment
Envisioning the development of an evolvable robotic ecosystem called \tol, where robots can evolve both software and hardware, many components still need to be developed.
% explain problem
One of the main missing components is teaching newborn robots to move, not just randomly, but towards a target of choice. The target could be an area to explore, a food source or a mating area.
% explain the aim of the project
>>>>>>> a06831f89d3e8175ef9f3c045980014db2de6494
This thesis aims to create a combination of learner and controller algorithms capable of generating targeted locomotion for a variety of robot morphologies.
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment