fix: merge conflict 해결

PrayHelper · Nov 7, 2023 · 25ec05f · 25ec05f
1 parent af2afe0
commit 25ec05f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/uspray/uspray/InitDb.java b/src/main/java/com/uspray/uspray/InitDb.java
@@ -1,6 +1,7 @@
 package com.uspray.uspray;
 
 import com.uspray.uspray.Enums.Authority;
+import com.uspray.uspray.Enums.PrayType;
 import com.uspray.uspray.domain.Category;
 import com.uspray.uspray.domain.Member;
 import com.uspray.uspray.domain.Pray;
@@ -56,7 +57,7 @@ public void dbInit() {
                 .deadline(LocalDate.parse("2025-01-01"))
                 .member(member)
                 .category(category)
-                .prayType(com.uspray.uspray.Enums.PrayType.PERSONAL)
+                .prayType(PrayType.PERSONAL)
                 .build();
             em.persist(pray);
         }