dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove merge conflict

This commit is contained in:
Parker Moore 2016-01-22 09:38:34 -08:00
parent afff4f0bec
commit 2b8de59717
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll/document.rb
View File

@ -443,11 +443,7 @@ module Jekyll
super super
end end
end end
<<<<<<< HEAD
=======
>>>>>>> origin/pull/cleanup-document__post_read
private # :nodoc: private # :nodoc:
def generate_excerpt def generate_excerpt
if generate_excerpt? if generate_excerpt?