From 2b8de5971725d4fb5404566f5d572cbe32ebf83a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 22 Jan 2016 09:38:34 -0800
Subject: [PATCH] remove merge conflict

---
 lib/jekyll/document.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 94def29b..2840ba51 100644
--- 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?