fix: resolved conflict with master repository

widget_group_17/announcements/admin.py

 from django.contrib import admin
 
+
 # Register your models here.
+from .models import Announcement
+
+admin.site.register(Announcement)
\ No newline at end of file

widget_group_17/announcements/migrations/0001_initial.py

+# Generated by Django 4.0.3 on 2022-03-21 12:48
+
+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(verbose_name='date published')),
+            ],
+        ),
+    ]

widget_group_17/announcements/models.py

 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")
\ No newline at end of file

widget_group_17/forum/admin.py

 from django.contrib import admin
+from .models import Post
 
 # Register your models here.
+
+admin.site.register(Post)
\ No newline at end of file

widget_group_17/forum/migrations/0001_initial.py

+# Generated by Django 4.0.3 on 2022-03-19 13:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Post',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('post_title', models.CharField(max_length=100)),
+                ('post_body', models.CharField(max_length=1000)),
+                ('pub_date', models.DateTimeField(verbose_name='Date published')),
+            ],
+        ),
+    ]

widget_group_17/forum/models.py

 from django.db import models
 
 # Create your models here.
+class Post(models.Model):
+    post_title = models.CharField(max_length=100)
+    post_body = models.CharField(max_length=1000)
+    pub_date = models.DateTimeField("Date published")

widget_group_17/homepage/admin.py

 from django.contrib import admin
 
 # Register your models here.
+from .models import WidgetUser
+
+admin.site.register(WidgetUser)

widget_group_17/homepage/migrations/0001_initial.py

+# Generated by Django 4.0.3 on 2022-03-16 13:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='WidgetUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=50)),
+                ('middle_name', models.CharField(max_length=50)),
+                ('last_name', models.CharField(max_length=50)),
+            ],
+        ),
+    ]

widget_group_17/homepage/models.py

 from django.db import models
 
 # Create your models here.
+class WidgetUser(models.Model):
+    first_name = models.CharField(max_length=50)
+    middle_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
\ No newline at end of file

widget_group_17/widget_group_17/settings.py

@@ -35,6 +35,9 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
+    'announcements.apps.AnnouncementsConfig',
+    'forum.apps.ForumConfig',
+    'homepage.apps.HomepageConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',