summaryrefslogtreecommitdiff
path: root/yaksh/admin.py
diff options
context:
space:
mode:
authoradityacp2020-04-27 14:50:28 +0530
committeradityacp2020-04-27 14:50:28 +0530
commit9fe624415d15f63f45a5327d74fe8c2432b03d13 (patch)
tree8781ccf6c01c8e124a0c836b487a23499e441bf1 /yaksh/admin.py
parentd5cdfe91335af6c79231d41453991af29a39e96e (diff)
parent53a0c4ad3e733f3960000527f83565f2fd8fc412 (diff)
downloadonline_test-9fe624415d15f63f45a5327d74fe8c2432b03d13.tar.gz
online_test-9fe624415d15f63f45a5327d74fe8c2432b03d13.tar.bz2
online_test-9fe624415d15f63f45a5327d74fe8c2432b03d13.zip
Resolve conflict
Diffstat (limited to 'yaksh/admin.py')
-rw-r--r--yaksh/admin.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/yaksh/admin.py b/yaksh/admin.py
index 9c36a98..3d3ba89 100644
--- a/yaksh/admin.py
+++ b/yaksh/admin.py
@@ -1,7 +1,7 @@
from yaksh.models import Question, Quiz, QuestionPaper, Profile
from yaksh.models import (TestCase, StandardTestCase, StdIOBasedTestCase,
Course, AnswerPaper, CourseStatus, LearningModule,
- Lesson
+ Lesson, Post, Comment
)
from django.contrib import admin
@@ -48,6 +48,8 @@ class QuizAdmin(admin.ModelAdmin):
admin.site.register(Profile, ProfileAdmin)
admin.site.register(Question)
admin.site.register(TestCase)
+admin.site.register(Post)
+admin.site.register(Comment)
admin.site.register(StandardTestCase)
admin.site.register(StdIOBasedTestCase)
admin.site.register(Course, CourseAdmin)