From 6289ec5cefce52500cad9610518adcebcefebbed Mon Sep 17 00:00:00 2001
From: Marina <verika_iz_viro@mail.ru>
Date: Wed, 8 Nov 2023 12:21:15 +0300
Subject: [PATCH] fix conflicts

---
 app/main/checks/__init__.py                     | 5 +----
 app/main/checks/presentation_checks/__init__.py | 3 ---
 requirements.txt                                | 7 -------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/main/checks/__init__.py b/app/main/checks/__init__.py
index cf090732..8ddc897e 100644
--- 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
index 7369cd04..095bf658 100644
--- 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
index 5e894bf1..47560892 100644
--- 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