WEB: fix git merge conflict

CoSMoMVPA · Mar 21, 2017 · de36799 · de36799
1 parent b22b171
commit de36799
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/doc/source/labman2017_intro.rst b/doc/source/labman2017_intro.rst
@@ -133,13 +133,8 @@ When:
 - 22, 23 March: 9:00-17:00
 - 25 March: 10:00-18:00
 
-<<<<<<< HEAD
 Location: Ciudad Universitaria de Buenos Aires, Pabellon 1, Laboratorios de Computacion, computer room 6.
-=======
-On Monday 20 March, we meet at Hall of Pabellon 1, in Ciudad Universitaria 9.30, and take it from there.
 
-Schedule to be announced.
->>>>>>> e4e910c7ba9957915bf7ea965adc7914a30be37d
 
 ..
     ============== ===================================================================================================