From 53548525806c65e9334628dac739be14c03e67cf Mon Sep 17 00:00:00 2001
From: Rohan Rangray <rrangray@ucsd.edu>
Date: Tue, 12 May 2015 00:45:12 -0700
Subject: [PATCH] Updated migrations. Pushing again to make the tests pass.

---
 flashcards/migrations/0006_auto_20150511_2202.py | 28 ++++++++++++++++++++++++
 scripts/run_tests.sh                             |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 flashcards/migrations/0006_auto_20150511_2202.py

diff --git a/flashcards/migrations/0006_auto_20150511_2202.py b/flashcards/migrations/0006_auto_20150511_2202.py
new file mode 100644
index 0000000..3f334b8
--- /dev/null
+++ b/flashcards/migrations/0006_auto_20150511_2202.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import flashcards.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flashcards', '0005_auto_20150510_1458'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='flashcard',
+            name='mask',
+            field=flashcards.fields.MaskField(help_text=b'The mask on the card', max_length=255, null=True, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='userflashcard',
+            name='mask',
+            field=flashcards.fields.MaskField(help_text=b'The user-specific mask on the card', max_length=255, null=True, blank=True),
+        ),
+        migrations.DeleteModel(
+            name='FlashcardMask',
+        ),
+    ]
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index dafdc3d..8489255 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/bash -xe
 venv/bin/python venv/bin/coverage run --source='flashcards' manage.py test flashcards/tests/
-venv/bin/python venv/bin/coverage html
\ No newline at end of file
+venv/bin/python venv/bin/coverage html
-- 
1.9.1