fix conflicts

moevm · Nov 8, 2023 · 6289ec5 · 6289ec5
1 parent bc3f7ef
commit 6289ec5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 14 deletions.
diff --git a/app/main/checks/__init__.py b/app/main/checks/__init__.py
@@ -15,11 +15,8 @@
         PresImageShareCheck.id: PresImageShareCheck,
         FurtherDev.id: FurtherDev,
         PresBannedWordsCheck.id: PresBannedWordsCheck,
-<<<<<<< HEAD
-        PresVerifyGitLinkCheck.id: PresVerifyGitLinkCheck
-=======
+        PresVerifyGitLinkCheck.id: PresVerifyGitLinkCheck,
         PresEmptySlideCheck.id: PresEmptySlideCheck,
->>>>>>> master
     },
     'report': {
         ReportSimpleCheck.id: ReportSimpleCheck,

diff --git a/app/main/checks/presentation_checks/__init__.py b/app/main/checks/presentation_checks/__init__.py
@@ -10,8 +10,5 @@
 from .pres_right_words import PresRightWordsCheck
 from .image_share import PresImageShareCheck
 from .banned_words import PresBannedWordsCheck
-<<<<<<< HEAD
 from .verify_git_link import PresVerifyGitLinkCheck
-=======
 from .empty_slide_check import PresEmptySlideCheck
->>>>>>> master
diff --git a/requirements.txt b/requirements.txt
@@ -25,15 +25,8 @@ docx2python~=2.0.4
 oauthlib~=3.1.0
 pdfplumber==0.6.1
 pytest~=7.1.2
-
-
 lxml~=4.9.2
 urllib3~=2.0.3
-
 filetype==1.2.0
 language-tool-python==2.7.1
-<<<<<<< HEAD
-
-=======
 markdown==3.4.4
->>>>>>> master