From cc65343635c8771e56e2a3304b42ec32f4f91b97 Mon Sep 17 00:00:00 2001 From: Maxiser Date: Thu, 28 Nov 2024 15:34:32 +0100 Subject: [PATCH] test --- .idea/dataSources.xml | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 9156fa5..3f2ad85 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,33 +1,14 @@ -<<<<<<< HEAD - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/ - $ProjectFileDir$ - - + mariadb true org.mariadb.jdbc.Driver - jdbc:mariadb://127.0.0.1:3306/hegreconfort -======= - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj - $ProjectFileDir$ - - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj ->>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f + jdbc:mariadb://localhost:3306/HegreConfort + + + $ProjectFileDir$