Resolve conflicts

1 files changed, 25 insertions, 0 deletions

diff --git a/yaksh/migrations/0021_auto_20200703_1556.py b/yaksh/migrations/0021_auto_20200703_1556.py
new file mode 100644
index 0000000..713b2d8
--- /dev/null
+++ b/yaksh/migrations/0021_auto_20200703_1556.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2020-07-03 10:26
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0020_release_0_21_0'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='end_enroll_time',
+            field=models.DateTimeField(default=datetime.datetime(2198, 12, 31, 18, 7, tzinfo=utc), null=True, verbose_name='End Date and Time for enrollment of course'),
+        ),
+        migrations.AlterField(
+            model_name='quiz',
+            name='end_date_time',
+            field=models.DateTimeField(default=datetime.datetime(2198, 12, 31, 18, 7, tzinfo=utc), null=True, verbose_name='End Date and Time of the quiz'),
+        ),
+    ]