github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-04-06 03:01:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove merge conflict

Browse Source
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
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
end
end
<<<<<<< HEAD
=======
>>>>>>> origin/pull/cleanup-document__post_read
private # :nodoc:
def generate_excerpt
if generate_excerpt?