Skip to content
Permalink
Browse files

merge conflict [ci skip]

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed May 23, 2015
1 parent c3d14b3 commit 0fdb9174298de496f35990ccafb57fd08cef678b
Showing with 0 additions and 2 deletions.
  1. +0 −2 CHANGES.txt
@@ -44,7 +44,6 @@ New in v7.4.0
Features
--------

>>>>>>> master
* Substitutions for RSS_LINKS_APPEND_QUERY for identifying
the source feed (feedRelUri) and the kind of feed (feedFormat).
* New option GENERATE_ATOM, off by default
@@ -62,7 +61,6 @@ Features
* Multilingual sitemaps (Issue #1610)
* Compatibility with doit v0.28.0 (Issue #1655)
* AddThis is no longer added by default to users’ sites
>>>>>>> master
* New translations (az, fil, tl, uk, zh_TW)
* Add reStructuredText transform support (Issue #1647)
* Produce Unicode output in ``nikola init`` (via Issue #1644)

0 comments on commit 0fdb917

Please sign in to comment.
You can’t perform that action at this time.