# Conflicts:
#	Frontend Angular 4/src/app/shared/config.ts
#	Servidor JEE/pom.xml
#	Servidor JEE/src/main/resources/META-INF/persistence.xml