[SQL-CVS] r2200 - SQLObject/trunk/sqlobject/versioning/test

[<sub...@co...>]

Author: novalis
Date: 2007-01-10 14:30:34 -0700 (Wed, 10 Jan 2007)
New Revision: 2200

Modified:
   SQLObject/trunk/sqlobject/versioning/test/test_version.py
Log:
oops

Modified: SQLObject/trunk/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:26:59 UTC (rev 2199)
+++ SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:30:34 UTC (rev 2200)
@@ -39,7 +39,6 @@
     foreign = ForeignKey("Base")
     versions = Versioning()
 
-<<<<<<< .mine
 def _set_extra():
     return "read all about it"