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

Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read 

* origin/pull/cleanup-document__post_read:
  add Utils.strip_heredoc
  Fix #4191: Reduce Document#post_read complexity slightly.
  Fix #4188: Extract title from filename successfully when dateless.
This commit is contained in:
Parker Moore 2016-01-22 09:37:58 -08:00
parent 5878acaaf1 1ba23c32c6
commit afff4f0bec
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll/document.rb
View File

@ -443,7 +443,11 @@ 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?