Merge branch 'master' into new_corrections

andres-mancera · web-flow · commit 7907aa5e2c47 · 2019-08-28T06:41:13.000-07:00
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
 ----
 
