|
@@ -1,15 +1,7 @@
|
|
|
#Generated by Maven Integration for Eclipse
|
|
#Generated by Maven Integration for Eclipse
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-#Wed Jan 06 14:17:20 KST 2021
|
|
|
|
|
-=======
|
|
|
|
|
-#Fri Jan 08 18:59:52 KST 2021
|
|
|
|
|
|
|
+#Wed Jan 13 09:48:24 KST 2021
|
|
|
version=0.0.1-SNAPSHOT
|
|
version=0.0.1-SNAPSHOT
|
|
|
groupId=com.style24.front
|
|
groupId=com.style24.front
|
|
|
m2e.projectName=style24.front
|
|
m2e.projectName=style24.front
|
|
|
->>>>>>> refs/heads/develop
|
|
|
|
|
m2e.projectLocation=D\:\\WIDE\\workspace\\webapps\\style24\\STYLE24\\style24.front
|
|
m2e.projectLocation=D\:\\WIDE\\workspace\\webapps\\style24\\STYLE24\\style24.front
|
|
|
artifactId=style24.front
|
|
artifactId=style24.front
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-version=0.0.1-SNAPSHOT
|
|
|
|
|
-=======
|
|
|
|
|
->>>>>>> refs/heads/develop
|
|
|
eskim