removed conflict marker

getnikola · Jun 10, 2015 · 6f60561 · 6f60561
1 parent 90ac2ae
commit 6f60561
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGES.txt b/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)