Skip to content

Commit 105e095

Browse files
committed
resolved merges
2 parents 99f2f6c + 9a1c73d commit 105e095

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

lesson_10/libraries/src/loaders/loaders.module.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
11
import { Module } from '@nestjs/common';
2-
<<<<<<< HEAD
2+
3+
34
import { AngelicaCastilloLoader } from './angelica_castillo_loader.js';
4-
=======
55
import { HummadTanweerLoader } from './hummad_tanweer_loader.js';
6-
>>>>>>> 3c9aee8 (Feat: Fixed two files for lesson 10 by Hummad Tanweer)
76
import { AnthonyMaysLoader } from './anthony_mays_loader.js';
8-
<<<<<<< HEAD
97
import { JamesCapparellLoader } from './james_capparell_loader.js';
108
import { NileJacksonLoader } from './nile_jackson_loader.js';
119
import { XavierCruzLoader } from './xavier_cruz_loader.js';
12-
=======
13-
>>>>>>> c255235 (resloved conflicts)
10+
1411

1512
export const Loaders = Symbol.for('Loaders');
1613

1714
// Add your quiz provider here.
18-
<<<<<<< HEAD
19-
<<<<<<< HEAD
2015
const LOADER_PROVIDERS = [
21-
AnthonyMaysLoader,
2216
AngelicaCastilloLoader,
17+
AnthonyMaysLoader,
18+
HummadTanweerLoader,
2319
JamesCapparellLoader,
2420
NileJacksonLoader,
2521
XavierCruzLoader,
2622
];
27-
=======
28-
const LOADER_PROVIDERS = [HummadTanweerLoader, AnthonyMaysLoader];
29-
>>>>>>> 3c9aee8 (Feat: Fixed two files for lesson 10 by Hummad Tanweer)
30-
=======
3123

32-
const LOADER_PROVIDERS = [AnthonyMaysLoader, HummadTanweerLoader];
3324

34-
>>>>>>> c255235 (resloved conflicts)
3525

3626
@Module({
3727
providers: [

0 commit comments

Comments
 (0)