From 94c935eb3db933dfa4f08eb52c8b4508993b8e47 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Garcia <a.garciagar.2016@alumnos.urjc.es>
Date: Wed, 8 Jul 2020 00:49:26 +0100
Subject: [PATCH] fix merge definitivo?

---
 Juego/.project                                                | 4 ----
 Juego/.springBeans                                            | 3 ---
 .../items-backend-and-frontend/pom.properties                 | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Juego/.project b/Juego/.project
index 9b6a5ce..33240fa 100644
--- 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
index b5c117b..521c636 100644
--- 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/Juego/target/classes/META-INF/maven/es.urjc.code.juegosenred/items-backend-and-frontend/pom.properties b/Juego/target/classes/META-INF/maven/es.urjc.code.juegosenred/items-backend-and-frontend/pom.properties
index c8a3648..93e5acf 100644
--- a/Juego/target/classes/META-INF/maven/es.urjc.code.juegosenred/items-backend-and-frontend/pom.properties
+++ b/Juego/target/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