From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 27 Mar 2009 21:42:41 +0000 (+0000)
Subject: fix crappity
X-Git-Tag: rel_0_5_4~49
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ccdd7f603e167f87f73da61871b11997d2da0ba9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix crappity
---

diff --git a/CHANGES b/CHANGES
index 2ef7414b24..b6d9dae3e5 100644
--- 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