sermandm/HegreEtConfort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sermandm:006fe2505dad26fb68aded217cffac3ca837ccce
Branches Tags
sermandm:master
sermandm:develop
sermandm:feature/Alyssa
sermandm:feature/Maxim
sermandm:feature/Lucas
sermandm:feature/Giovanny
..
compare: sermandm:ad7f61275c99c111ac1aac37f554f73c875db459
Branches Tags
sermandm:develop
sermandm:feature/Alyssa
sermandm:feature/Maxim
sermandm:master
sermandm:feature/Lucas
sermandm:feature/Giovanny

No commits in common. "006fe2505dad26fb68aded217cffac3ca837ccce" and "ad7f61275c99c111ac1aac37f554f73c875db459" have entirely different histories.
006fe2505d ... ad7f61275c

1 changed files with 0 additions and 11 deletions
Show Stats Expand all files Collapse all files

11
.idea/dataSources.xml generated
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true"> <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153"> <data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153">
======= =======
@ -33,16 +32,6 @@
<jdbc-driver>org.postgresql.Driver</jdbc-driver> <jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url> <jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url>
>>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f
=======
<data-source source="LOCAL" name="HegreConfort@localhost" uuid="755cf5bd-875b-416d-8bc2-76a5b9ba2d4d">
<driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mariadb://localhost:3306/HegreConfort</jdbc-url>
<jdbc-additional-properties>
<property name="database.introspection.mysql.dbe5060" value="true" />
</jdbc-additional-properties>
>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
<working-dir>$ProjectFileDir$</working-dir> <working-dir>$ProjectFileDir$</working-dir>
</data-source> </data-source>
</component> </component>