머지 수정

style24.front/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Build-Jdk-Spec: 14
 Implementation-Title: style24.front
 Implementation-Version: 0.0.1-SNAPSHOT
+Build-Jdk-Spec: 1.8
 Created-By: Maven Integration for Eclipse
 

style24.front/target/m2e-wtp/web-resources/META-INF/maven/com.style24.front/style24.front/pom.properties

@@ -1,14 +1,7 @@
 #Generated by Maven Integration for Eclipse
-<<<<<<< HEAD
-#Wed Jan 06 14:17:20 KST 2021
-=======
-#Wed Jan 06 15:15:11 KST 2021
+#Fri Jan 08 18:59:52 KST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.style24.front
 m2e.projectName=style24.front
->>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
 m2e.projectLocation=D\:\\WIDE\\workspace\\webapps\\style24\\STYLE24\\style24.front
-m2e.projectName=style24.front
-groupId=com.style24.front
 artifactId=style24.front
-version=0.0.1-SNAPSHOT