From 5f83915a461a7b57fa55e0e6144e381fcf2e1cd8 Mon Sep 17 00:00:00 2001
From: Michael Christopher Manullang <manullang.c@gmail.com>
Date: Fri, 9 Oct 2020 15:49:30 +0700
Subject: [PATCH] The last commit I did not save tests.py i saved it now
---
app/tests.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/tests.py b/app/tests.py
index 996e11b..0be875f 100644
--- a/app/tests.py
+++ b/app/tests.py
@@ -1355,7 +1355,6 @@ class RevisiMateriTest(TestCase):
self.assertEqual(response.status_code, 200)
# Logout
self.client.logout()
-<<<<<<< HEAD
class NameBannerFunctionalTest(LiveServerTestCase):
selenium = None
@@ -1389,7 +1388,6 @@ class NameBannerFunctionalTest(LiveServerTestCase):
-=======
class GenerateDummyCommandTest(TestCase):
@@ -2109,4 +2107,3 @@ class MateriModelTest(TestCase):
Like.objects.create(timestamp=datetime.now(), materi=self.materi, session_id="dummysessionid2")
self.assertEqual(2, self.materi.like_count)
->>>>>>> 0a815a6d87c62d6e1ba35f5645c26ce81ef2dfdb
--
GitLab