Skip to content
Permalink
Browse files
removed conflict marker
  • Loading branch information
ralsina committed Jun 10, 2015
1 parent 90ac2ae commit 6f605618adff90dc5e004368dfb07c0ca85cc724
Showing with 0 additions and 1 deletion.
  1. +0 −1 CHANGES.txt
@@ -24,7 +24,6 @@ Features
--------

* Make default themes more accessible (Issue #377)
>>>>>>> master
* Add ipython support to the default themes (Issue #1782)
* Automatically mark ipynb posts/pages as requiring mathjax (Issue #1782)
* New --get-path option for ``nikola install_theme`` (Issue #1762)

0 comments on commit 6f60561

Please sign in to comment.