undo accidental stash pop

AmericanAirlines · Jan 3, 2024 · 8ecf531 · 8ecf531
1 parent 83176bf
commit 8ecf531
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/packages/database/seeds/seeders/ExpoJudgingSessionSeeder.ts b/packages/database/seeds/seeders/ExpoJudgingSessionSeeder.ts
@@ -10,7 +10,6 @@ export class ExpoJudgingSessionSeeder extends Seeder {
   run = async (em: EntityManager): Promise<void> => {
     if (env.primaryUserIsAdmin) {
       try {
-<<<<<<< Updated upstream
         const projects = await em.find(Project, {});
         const admin = await em.findOneOrFail(User, { id: '1' });
 
@@ -21,16 +20,6 @@ export class ExpoJudgingSessionSeeder extends Seeder {
           });
           expoJudgingSession.projects.set(projects);
 
-=======
-        for(let i=0;i<2;i=i+1){
-          const admin = await em.findOneOrFail(User, { id: '1' });
-          const expoJudgingSession = new ExpoJudgingSession({
-            createdBy: ref(admin),
-          });
-          const projects = await em.find(Project, {});
-          expoJudgingSession.projects.set(projects);
-
->>>>>>> Stashed changes
           em.persist(expoJudgingSession);
         }
       } catch {
@@ -39,4 +28,4 @@ export class ExpoJudgingSessionSeeder extends Seeder {
       }
     }
   };
-}
+}