Add more merge conflict fixes

BinaryStudioAcademy · Aug 31, 2023 · cc2a6b7 · cc2a6b7
1 parent 18d207c
commit cc2a6b7
Showing 1 changed file with 0 additions and 10 deletions.
diff --git 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,