Browse Source

Merge branch 't11'

Conflicts:
	EditorialModel/fieldtypes.py
Roland Haroutiounian 9 years ago
parent
commit
3674f2044c
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      EditorialModel/fieldtypes.py

+ 1
- 1
EditorialModel/fieldtypes.py View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 from EditorialModel.components import EmComponent, EmComponentNotExistError
4 4
 from Lodel.utils.mlstring import MlString
5
-from sqlalchemy import Column, INTEGER, BOOLEAN
5
+from sqlalchemy import Column, INTEGER, BOOLEAN, VARCHAR
6 6
 
7 7
 def get_field_type(name):
8 8
     class_name = 'EmField_' + name

Loading…
Cancel
Save