add block_type to the south introspection rules

Conflicts: src/django_fields/fields.py
svetlyak40wt · Jul 9, 2013 · 8456a04 · 8456a04
1 parent a453e61
commit 8456a04
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/django_fields/fields.py b/src/django_fields/fields.py
@@ -301,10 +301,10 @@ def formfield(self, **kwargs):
 
 class EncryptedUSSocialSecurityNumberField(BaseEncryptedField):
     __metaclass__ = models.SubfieldBase
-    
+
     def get_internal_type(self):
         return "CharField"
-    
+
     def formfield(self, **kwargs):
         from django.contrib.localflavor.us.forms import USSocialSecurityNumberField
         defaults = {'form_class': USSocialSecurityNumberField}
@@ -336,12 +336,8 @@ 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"])