|
|
@@ -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
|
|
|
-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
|
|
|
+version=0.0.1-SNAPSHOT
|
eskim