how long has this been here? 🤦🏼‍♂️

openstax · Feb 17, 2025 · 92e108d · 92e108d
1 parent 59190df
commit 92e108d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/shared/tests.py b/shared/tests.py
@@ -1,9 +1,5 @@
 from django.test import TestCase
 from shared.test_utilities import mock_user_login, RequestMock
-<<<<<<< HEAD
-=======
-
->>>>>>> 8e0972ecb0cb613b6bf9a96425fc017e5fe918e7
 from unittest.mock import MagicMock
 
 class TestMockUserLogin(TestCase):