<<<<<<< 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 $ProjectFileDir$