Fixed merge conflict

2014-09-25 12:51:39 +02:00
parent 5c07c511fa
commit 502327e531
1 changed files with 1 additions and 2 deletions
@@ -27,7 +27,6 @@ print 'Testing against %s engine (%s)' % (DEFAULT_URI.partition(':')[0], DEFAULT
 from dal import DAL, Field
 from dal.objects import Table
 from dal.helpers.classes import SQLALL
 from dal import DAL, Field, Table, SQLALL
 from gluon.cache import CacheInRam
 ALLOWED_DATATYPES = [