Merge branch 'master' into new_corrections

progit · Aug 28, 2019 · 7907aa5 · 7907aa5
2 parents 2c36a91 + 0e143f5
commit 7907aa5
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
 ----