Skip to content

Commit 0902ffc

Browse files
committed
Chore: fixing merge conflicts
1 parent d548698 commit 0902ffc

File tree

3 files changed

+0
-132
lines changed

3 files changed

+0
-132
lines changed

lesson_10/libraries/src/loaders/dylan_lafferty_loaders.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
import { Module } from '@nestjs/common';
22

33
import { AnthonyMaysLoader } from './anthony_mays_loader.js';
4-
lesson10
54
import { KhaylaSaundersLoader } from './khayla_saunders_loader.js';
65

76
export const Loaders = Symbol.for('Loaders');
87

98
const LOADER_PROVIDERS = [AnthonyMaysLoader, KhaylaSaundersLoader];
10-
import { DylanLaffertysLoader } from './dylan_lafferty_loaders.js';
11-
import { MercedesMathewsLoader } from './mercedes_mathews_loader.js';
12-
13-
export const Loaders = Symbol.for('Loaders');
14-
15-
const LOADER_PROVIDERS = [
16-
AnthonyMaysLoader,
17-
DylanLaffertysLoader,
18-
MercedesMathewsLoader,
19-
];
20-
main
219

2210
@Module({
2311
providers: [

lesson_10/libraries/src/loaders/mercedes_mathews_loader.ts

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)