fix merge definitivo?

ReyDoran · Jul 7, 2020 · 94c935e · 94c935e
1 parent d152a8f
commit 94c935e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/Juego/.project b/Juego/.project
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-<<<<<<< HEAD
-	<name>JR-Grupo-H</name>
-=======
 	<name>JR-GRUPO_H-WEBSOCKET</name>
->>>>>>> developing
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/Juego/.springBeans b/Juego/.springBeans
@@ -9,10 +9,7 @@
 	<configs>
 	</configs>
 	<autoconfigs>
-<<<<<<< HEAD
-=======
 		<config>java:es.urjc.code.juegosenred.Rest</config>
->>>>>>> developing
 	</autoconfigs>
 	<configSets>
 	</configSets>

diff --git a/...classes/META-INF/maven/es.urjc.code.juegosenred/items-backend-and-frontend/pom.properties b/...classes/META-INF/maven/es.urjc.code.juegosenred/items-backend-and-frontend/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Jul 08 00:31:50 BST 2020
+#Wed Jul 08 00:49:08 BST 2020
 version=0.0.1-SNAPSHOT
 groupId=es.urjc.code.juegosenred
 m2e.projectName=items-backend-and-frontend