<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< 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$ >>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117 postgresql true org.postgresql.Driver jdbc:postgresql://172.20.96.1:5432/chauffageproj >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f ======= mariadb true org.mariadb.jdbc.Driver jdbc:mariadb://localhost:3306/HegreConfort >>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97 $ProjectFileDir$