fix merge error

Sources/API/Quarkus/src/main/java/org/acme/Hibernates/entities/GameEntity.java

@@ -4,22 +4,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-<<<<<<< HEAD
-import javax.persistence.Entity;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
-@Entity
-=======
 
 import javax.persistence.*;
-@Entity
-@Table(name="games")
->>>>>>> bcd6335175194e1c12cc113060a02e202da0af79
+
+// @Entity
+// @Table(name = "games")
 public class GameEntity {
 
     @Id

Sources/API/Quarkus/src/main/resources/application.properties

@@ -6,13 +6,13 @@ quarkus.datasource.reactive.url = vertx-reactive:postgresql://localhost:5432/pos
 quarkus.hibernate-orm.log.sql=true
 quarkus.hibernate-orm.sql-load-script=import.sql
 
-# #HTTPS Configuration
+#HTTPS Configuration
 
-# quarkus.http.ssl.certificate.key-files=https/privkey.pem
-# quarkus.http.ssl.certificate.files=https/cert.pem
+quarkus.http.ssl.certificate.key-files=https/privkey.pem
+quarkus.http.ssl.certificate.files=https/cert.pem
 
-# # Disable the HTTP server
-# quarkus.http.insecure-requests=redirect
+# Disable the HTTP server
+quarkus.http.insecure-requests=redirect
 
 # # OIDC Configuration
 # quarkus.oidc.auth-server-url=http://localhost:8080/realms/BowlinAuth