resloved conflicts

Author: htanweer244

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

@@ -5,14 +5,18 @@ import { AngelicaCastilloLoader } from './angelica_castillo_loader.js';
 import { HummadTanweerLoader } from './hummad_tanweer_loader.js';
 >>>>>>> 3c9aee8 (Feat: Fixed two files for lesson 10 by Hummad Tanweer)
 import { AnthonyMaysLoader } from './anthony_mays_loader.js';
+<<<<<<< HEAD
 import { JamesCapparellLoader } from './james_capparell_loader.js';
 import { NileJacksonLoader } from './nile_jackson_loader.js';
 import { XavierCruzLoader } from './xavier_cruz_loader.js';
+=======
+>>>>>>> c255235 (resloved conflicts)
 
 export const Loaders = Symbol.for('Loaders');
 
 // Add your quiz provider here.
 <<<<<<< HEAD
+<<<<<<< HEAD
 const LOADER_PROVIDERS = [
   AnthonyMaysLoader,
   AngelicaCastilloLoader,
@@ -23,6 +27,11 @@ const LOADER_PROVIDERS = [
 =======
 const LOADER_PROVIDERS = [HummadTanweerLoader, AnthonyMaysLoader];
 >>>>>>> 3c9aee8 (Feat: Fixed two files for lesson 10 by Hummad Tanweer)
+=======
+
+const LOADER_PROVIDERS = [AnthonyMaysLoader, HummadTanweerLoader];
+
+>>>>>>> c255235 (resloved conflicts)
 
 @Module({
   providers: [