From 3b05fbd2dca8411ecc00695c6657a4adf2aa6bcb Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@DESKTOP-QACOVCB.mshome.net>
Date: Mon, 27 Nov 2023 13:58:34 +0100
Subject: [PATCH] eliminar comentarios

---
 src/main/resources/schema.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index eed250a..4447237 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -27,10 +27,6 @@ create table Competicion(
     tiemposparciales boolean not null,
     tp1 decimal(4,2), tp2 decimal(4,2),
     tp3 decimal(4,2), tp4 decimal(4,2), tp5 decimal(4,2),
-<<<<<<< HEAD
-=======
-    iban varchar(40) unique,
->>>>>>> refs/heads/main
         check(tipo in('Montaña','Ruta')),
         check(cancelacion in('Si','No'))
 );