add block_type to the south introspection rules

Conflicts: src/django_fields/fields.py
svetlyak40wt · Jul 9, 2013 · a453e61 · a453e61
1 parent ec8b3e6
commit a453e61
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/django_fields/fields.py b/src/django_fields/fields.py
@@ -336,7 +336,12 @@ def formfield(self, **kwargs):
             ],
             [],
             {
+<<<<<<< HEAD
                 'cipher':('cipher_type', {}),
+=======
+                'cipher': ('cipher_type', {}),
+                'block_type': ('block_type', {}),
+>>>>>>> f5ec63e... add block_type to the south introspection rules
             },
         ),
     ], ["^django_fields\.fields\..+?Field"])