From cc2a6b7a9efc5af66efe9ef4bd8060a80e3556b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A8=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BA=D1=96=D0=B2?= <322topgamerintheworld228@gmail.com>
Date: Thu, 31 Aug 2023 20:09:50 +0300
Subject: [PATCH] Add more merge conflict fixes

---
 frontend/src/app/shared/shared.module.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 9755a2fea..fc420f7a7 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -14,11 +14,6 @@ import { TabsetConfig, TabsModule } from 'ngx-bootstrap/tabs';
 import { MarkdownModule } from 'ngx-markdown';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 
-<<<<<<< HEAD
-import { ChallengeComponent } from './components/challenge/challenge.component';
-import { ChallengesDropdownSelectComponent } from './components/challenges-dropdown-select/challenges-dropdown-select.component';
-=======
->>>>>>> dev
 import { CodeEditorComponent } from './components/code-editor/code-editor.component';
 import { ConfirmationModalComponent } from './components/confirmation-modal/confirmation-modal.component';
 import { CustomInputComponent } from './components/custom-input/custom-input.component';
@@ -70,11 +65,6 @@ import { ProgressBarComponent } from './components/progress-bar/progress-bar.com
         ConfirmationModalComponent,
         GeneralModalComponent,
         DropdownSelectComponent,
-<<<<<<< HEAD
-        ChallengesDropdownSelectComponent,
-        SuggestedChallengeComponent,
-=======
->>>>>>> dev
         CustomInputComponent,
         PieChartComponent,
         ProgressBarComponent,