Fix merge.

horde · Jul 4, 2017 · cc61cbd · cc61cbd
1 parent 9e8cf9f
commit cc61cbd
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/trean/docs/CHANGES b/trean/docs/CHANGES
@@ -30,7 +30,6 @@ v1.1.5
 
 [jan] Add Greek translation (Limperis Antonis <limperis@cti.gr>).
 [cjh] Fix error when deleting bookmarks.
->>>>>>> ea59bad... Fix even more redirects.
 
 
 ------