summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-03-27 21:42:41 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-03-27 21:42:41 +0000
commitccdd7f603e167f87f73da61871b11997d2da0ba9 (patch)
treef985b773a0d756413e431e49938016b14356862d
parentd65c25bcc9f6fcfb420d60332e6aba25c0995562 (diff)
downloadsqlalchemy-ccdd7f603e167f87f73da61871b11997d2da0ba9.tar.gz
fix crappity
-rw-r--r--CHANGES1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 2ef7414b2..b6d9dae3e 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