Resolved cache conflicts.

widget_group_17/forum/admin.py

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

widget_group_17/forum/models.py

@@ -2,6 +2,16 @@ from django.db import models
 
 # Create your models here.
 class Post(models.Model):
+    author = models.ForeignKey(WidgetUser, on_delete=models.CASCADE)
     post_title = models.CharField(max_length=100)
     post_body = models.CharField(max_length=1000)
-    pub_date = models.DateTimeField("Date published")
\ No newline at end of file
+<<<<<<< HEAD
+    pub_date = models.DateTimeField("Date published")
+=======
+    pub_date = models.DateTimeField("Date published")
+
+class Reply(models.Model):
+    author = models.ForeignKey(WidgetUser, on_delete=models.CASCADE)
+    reply_body = models.CharField(max_length=1000)
+    pub_date = models.DateTimeField("Replied on")
+>>>>>>> bandelaria/forum