fix conflicts

pyprevention/dashboard/migrations/0005_auto_20181029_2025.py

+# Generated by Django 2.1.2 on 2018-10-29 20:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0004_raspi_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='raspi',
+            name='ip',
+            field=models.CharField(choices=[('up', 'up'), ('down', 'down')], max_length=50),
+        ),
+    ]

pyprevention/dashboard/migrations/0006_auto_20181029_2025.py

+# Generated by Django 2.1.2 on 2018-10-29 20:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0005_auto_20181029_2025'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='raspi',
+            name='ip',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='raspi',
+            name='status',
+            field=models.CharField(choices=[('up', 'up'), ('down', 'down')], max_length=5),
+        ),
+    ]

pyprevention/dashboard/migrations/0007_auto_20181030_0826.py

+# Generated by Django 2.1.2 on 2018-10-30 08:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0006_auto_20181029_2025'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='raspi',
+            name='status',
+            field=models.CharField(choices=[('UP', 'UP'), ('DOWN', 'DOWN')], max_length=5),
+        ),
+    ]

pyprevention/dashboard/migrations/0008_auto_20181030_0828.py

+# Generated by Django 2.1.2 on 2018-10-30 08:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0007_auto_20181030_0826'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='raspi',
+            name='status',
+            field=models.CharField(choices=[('UP', 'UP'), ('DOWN', 'DOWN')], default='UP', max_length=5),
+        ),
+    ]

pyprevention/dashboard/models.py

@@ -16,6 +16,12 @@ class Patient(models.Model):
     def __str__(self):
         return self.last_name + self.first_name
 
+
+
 class Raspi(models.Model):
+    STATUS_CHOICES = [
+        ('UP', 'UP'),
+        ('DOWN', 'DOWN'),
+    ]
     ip = models.CharField(max_length=50)
-    status = models.CharField(max_length=5)
+    status = models.CharField(max_length=5, choices=STATUS_CHOICES, default="UP")