Resolved conflicts and changes.

parent 389ab1fc
......@@ -4,4 +4,4 @@ from django.db import models
class Post(models.Model):
post_title = models.CharField(max_length=100)
post_body = models.CharField(max_length=1000)
pub_date = models.DateTimeField("Date published")
pub_date = models.DateTimeField("Date published")
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment