remove merge conflict

2016-01-22 09:38:34 -08:00 · 2016-01-22 09:38:34 -08:00 · 2b8de59717
parent afff4f0bec
commit 2b8de59717
1 changed files with 0 additions and 4 deletions
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@ -443,11 +443,7 @@ module Jekyll
        super
      end
    end
-<<<<<<< HEAD

-=======
-
->>>>>>> origin/pull/cleanup-document__post_read
    private # :nodoc:
    def generate_excerpt
      if generate_excerpt?