From 25ec05f5ed8f4e56ca522989fc9fb3d560358de1 Mon Sep 17 00:00:00 2001
From: dong2ast <kdh01132006@naver.com>
Date: Tue, 7 Nov 2023 19:27:56 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20merge=20conflict=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/uspray/uspray/InitDb.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/uspray/uspray/InitDb.java b/src/main/java/com/uspray/uspray/InitDb.java
index eea1a570..3dfdd8f6 100644
--- 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);
         }