From a453e6126619e124f89651744a54a55896aaf363 Mon Sep 17 00:00:00 2001
From: Aron Jones <aron.jones@gmail.com>
Date: Tue, 9 Jul 2013 13:38:58 -0400
Subject: [PATCH] add block_type to the south introspection rules

Conflicts:
	src/django_fields/fields.py
---
 src/django_fields/fields.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/django_fields/fields.py b/src/django_fields/fields.py
index d5c2538..db6e6b1 100644
--- 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"])