Resuelve conflictos con repositorio UNAP

.gitignore

@@ -1,6 +1,9 @@
+<<<<<<< HEAD
+=======
 
 *.class
 =======
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
 HELP.md
 target/
 .mvn/wrapper/maven-wrapper.jar
@@ -31,3 +34,9 @@ target/
 build/
 !**/src/main/**/build/
 !**/src/test/**/build/
+<<<<<<< HEAD
+
+### VS Code ###
+.vscode/
+=======
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382

Dockerfile

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 # ─── ETAPA 1: BUILD ───────────────────────────────────────────────────────────
 FROM maven:3-eclipse-temurin-25 AS builder
 
@@ -12,13 +14,22 @@ COPY src ./src
 RUN mvn package -DskipTests -q
 
 # ─── ETAPA 2: RUNTIME ─────────────────────────────────────────────────────────
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
 FROM eclipse-temurin:25-jdk
 
 WORKDIR /app
 
+<<<<<<< HEAD
+COPY target/*.jar app.jar
+
+EXPOSE 8080
+
+ENTRYPOINT ["java","-jar","/app/app.jar"]
+=======
 # Solo copia el .jar generado — Maven y el código fuente NO están aquí
 COPY --from=builder /app/target/*.jar app.jar
 
 EXPOSE 8080
 
 ENTRYPOINT ["java", "-jar", "app.jar"]
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382

README.md

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+fisrt_respositories
+=======
 
 fisrt_respositories
 >>>>>>> 1b686e8 (Add initial README with repository name)
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382

docker-compose_prod.yml

@@ -9,6 +9,8 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: ${MYSQL_ALLOW_EMPTY_PASSWORD}
     ports:
       - "3306:3306"
+<<<<<<< HEAD
+=======
     volumes:
       - mysql_data:/var/lib/mysql
     healthcheck:
@@ -16,6 +18,7 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
     restart: unless-stopped
 
   backend:
@@ -24,15 +27,23 @@ services:
       dockerfile: Dockerfile
     container_name: spring_admision
     depends_on:
+<<<<<<< HEAD
+      - mysql
+=======
       mysql:
         condition: service_healthy
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
     ports:
       - "8080:8080"
     environment:
       SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?useSSL=false&serverTimezone=UTC
       SPRING_DATASOURCE_USERNAME: root
       SPRING_DATASOURCE_PASSWORD: ""
+<<<<<<< HEAD
+    restart: unless-stopped
+=======
     restart: unless-stopped
 
 volumes:
   mysql_data:
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382