.gitignore
38 Bytes
-
Conflicts: src/main/java/fr/plil/sio/persistence/jdbc/RightServiceJdbc.java src/test/resources/application.properties
Conflicts: src/main/java/fr/plil/sio/persistence/jdbc/RightServiceJdbc.java src/test/resources/application.properties