fix crappity

diff --git a/CHANGES b/CHANGES
index 2ef7414b24b34331b964e89e676397555bb70895..b6d9dae3e525a125958aa262c673f7d62e612bf5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,7 +23,6 @@ CHANGES
       binary collation based database. Cleaned up information
       schema since it is only used by mssql now. [ticket:1343]
 
->>>>>>> .r5862
 0.5.3
 =====
 - orm