fix:与英语原文保持一致 again

kang8 · networm · commit 66f61059bfd4 · 2020-06-28T07:12:56.000+08:00
diff --git a/book/07-git-tools/sections/rerere.asc b/book/07-git-tools/sections/rerere.asc
@@ -217,7 +217,11 @@ $ cat hello.rb
 #! /usr/bin/env ruby
 
 def hello
+<<<<<<< ours
+  puts 'hola world'
+=======
   puts 'hello mundo'
+>>>>>>> theirs
 end
 ----
 
