GitBucket
|
Merge remote-tracking branch 'orgigin/simple' into simple
# Conflicts: # .idea/libraries/Gradle__junit_junit_4_11.xml # .idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3.xml # .idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml # .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml # .idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml # .idea/modules/simple-database_main.iml # .idea/modules/simple-database_test.iml # .idea/workspace.xml |
|---|
|
|
| .idea/libraries/Gradle__com_h2database_h2_1_4_193.xml 0 → 100644 |
|---|
| .idea/libraries/Gradle__nl_astraeus_jdbc_simple_jdbc_stats_1_5_3.xml 0 → 100644 |
|---|
| .idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml 0 → 100644 |
|---|
| .idea/modules/simple-database.iml |
|---|
| build.gradle |
|---|
| src/nl/astraeus/database/annotations/Column.java |
|---|
| src/nl/astraeus/database/annotations/Reference.java |
|---|
| test/nl/astraeus/database/BaseTest.java |
|---|
| test/nl/astraeus/database/TestMultipleDatabase.java 0 → 100644 |
|---|