From 37327ee9bf7d94f8cb981151be34016070d95afc Mon Sep 17 00:00:00 2001
From: Don Strawsburg <don@goforward.group>
Date: Mon, 5 Jan 2026 22:13:31 -0500
Subject: [PATCH] merge conflict fixed

---
 src/main/resources/application.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 86e261e..080aafc 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,6 +5,10 @@ spring.datasource.username=postgres
 spring.datasource.password=cul8rman
 spring.datasource.driver-class-name=org.postgresql.Driver
 
+# Hibernate properties
+#spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 
 security.jwt.secret=ballistic-test-secret-key-1234567890-ABCDEFGHIJKLNMOPQRST
 security.jwt.access-token-minutes=2880