resolve conflict

3 years ago · 47e24a4f7a
parent cf4c603da6
commit 47e24a4f7a
3 changed files with 1 additions and 1 deletions
--- a/data-dev.sqlite
+++ b/data-dev.sqlite
--- a/data-dev.sqlite-journal
+++ b/data-dev.sqlite-journal
--- a/test.py
+++ b/test.py
@ -16,4 +16,4 @@ print(Role.query.all())
 print(Students.query.all())
 print(Post.query.all())
 print(Comment.query.all())
-print(Activity.query.all())
+print(Activity.query.all())