Typo again

joansola · Aug 6, 2015 · 6437cec · 6437cec
1 parent c721b9e
commit 6437cec
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.txt b/README.txt
@@ -72,7 +72,11 @@ B. In the Matlab prompt:
 
         >> cd slamtb
 
+<<<<<<< HEAD
 2. Add all subdirectories in slamtb/ to your Matlab path using the provided script: 
+=======
+2. Add all subdirectories in %SLAMTB/ to your Matlab path using the provided script: 
+>>>>>>> Typo again
 
         >> slamrc