From 8843d8d8046b6b8b9ae53cfa9b405833e275b1a5 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <tisto@plone.org>
Date: Mon, 27 Apr 2015 15:01:13 +0200
Subject: [PATCH] Remove merge leftover.

---
 CHANGES.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 75ba92a..b635899 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -127,7 +127,6 @@ Changelog
 - Put defaultUser.png instead of old defaultUser.gif
   [bsuttor]
 
->>>>>>> master
 - Remove bbb directory. bbb was never really implemented.
   [timo]