ashmaroli ed20cb4f90 Remind user to resolve conflict in `jekyll new` with `--force` (#6801) ... Merge pull request 6801		2018-02-27 17:29:05 -05:00
..
jekyll	Remind user to resolve conflict in `jekyll new` with `--force` (#6801)	2018-02-27 17:29:05 -05:00
site_template	Ignore final newline in folded YAML string (#6054)	2017-07-18 03:29:33 -04:00
theme_template	Lint file and bump theme dependencies (#6698)	2018-01-19 10:50:23 -05:00
jekyll.rb	Do not hardcode locale unless certainly necessary (#6791)	2018-02-25 06:09:44 -05:00