Trying to fix conflicts on my end

README.md

@@ -4,8 +4,9 @@
 + Forum
 
 **Alissandra Tanaliga:**
-+ Announcements
-+ Assignments
++ Announcements (Lab 1)
++ Assignments (Lab 1)
++ Assignments Models (Lab 2)
 
 **Video Links:**
 + Lab 1: https://youtu.be/2P8rq0mgeQU

announcements/admin.py

 from django.contrib import admin
+from .models import Announcement
 
 # Register your models here.
+class AnnouncementAdmin(admin.ModelAdmin):
+    model = Announcement
+
+admin.site.register(Announcement, AnnouncementAdmin)
\ No newline at end of file

announcements/migrations/0001_initial.py

+# Generated by Django 3.2.12 on 2022-03-21 13:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Announcement',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('announcement_title', models.CharField(max_length=50)),
+                ('announcement_body', models.CharField(max_length=500)),
+                ('pub_date', models.DateTimeField(auto_now=True, verbose_name='Date Published')),
+            ],
+        ),
+    ]

announcements/models.py

+from msilib.schema import Class
 from django.db import models
 
 # Create your models here.
+class Announcement(models.Model):
+    announcement_title = models.CharField(max_length=50)
+    announcement_body = models.CharField(max_length=500)
+    pub_date = models.DateTimeField("Date Published", auto_now=True)
\ No newline at end of file

assignments/admin.py

 from django.contrib import admin
+from .models import Assignment
 
 # Register your models here.
+class AssignmentAdmin(admin.ModelAdmin):
+    model = Assignment
+
+admin.site.register(Assignment, AssignmentAdmin)
\ No newline at end of file

assignments/migrations/0001_initial.py

+# Generated by Django 4.0.3 on 2022-03-16 08:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Assignment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('description', models.CharField(max_length=500)),
+                ('max_points', models.IntegerField()),
+            ],
+        ),
+    ]

assignments/models.py

 from django.db import models
 
 # Create your models here.
+class Assignment(models.Model):
+    name = models.CharField(max_length=50)
+    description = models.CharField(max_length=500)
+    max_points = models.IntegerField()
\ No newline at end of file