Merge branch 'new_corrections' of https://github.com/DiegoFRamirez/pr…

…ogit2-es into new_corrections
progit · Sep 2, 2019 · e0e1f11 · e0e1f11
2 parents 0cd1071 + 7907aa5
commit e0e1f11
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/book/07-git-tools/sections/rerere.asc b/book/07-git-tools/sections/rerere.asc
@@ -204,11 +204,11 @@ $ cat hello.rb
 #! /usr/bin/env ruby
 
 def hello
-<<<<<<< ours
+<<<<<< ours
   puts 'hola world'
-=======
+======
   puts 'hello mundo'
->>>>>>> theirs
+>>>>>> theirs
 end
 ----