Merge branch 'simple'

Fork: 0

rnentjes / simple-database-kotlin

Browse code Merge branch 'simple' # Conflicts: # .idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml # .idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml # .idea/modules/simple-database-kotlin.iml # .idea/modules/simple-database-kotlin_main.iml # .idea/modules/simple-database-kotlin_test.iml # build.gradle # src/nl/astraeus/database/Database.kt # src/nl/astraeus/database/Queries.kt # src/test/kotlin/nl/astraeus/database/TestQueries.kt master
commit 997adb1dcb449d08b29556e87d2ed25dc935d1b5 2 parents 67dc03d + 0c056cb rnentjes authored on 28 Apr 2019

Browse code

# Conflicts:
#	.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml
#	.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
#	.idea/modules/simple-database-kotlin.iml
#	.idea/modules/simple-database-kotlin_main.iml
#	.idea/modules/simple-database-kotlin_test.iml
#	build.gradle
#	src/nl/astraeus/database/Database.kt
#	src/nl/astraeus/database/Queries.kt
#	src/test/kotlin/nl/astraeus/database/TestQueries.kt

master

commit 997adb1dcb449d08b29556e87d2ed25dc935d1b5

2 parents 67dc03d + 0c056cb

rnentjes authored on 28 Apr 2019

Patch

Unified Split

Showing 26 changed files

Ignore Space Show notes View .idea/checkstyle-idea.xml 0 → 100644

Ignore Space Show notes View .idea/hotswap_agent.xml 0 → 100644

Show notes View .idea/libraries/Gradle__com_h2database_h2_1_4_192.xml 100644 → 0

Ignore Space Show notes View .idea/libraries/Gradle__com_h2database_h2_1_4_196.xml 0 → 100644

Show notes View .idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml 100644 → 0

Ignore Space Show notes View .idea/libraries/Gradle__nl_astraeus_simple_database_2_0_4.xml 0 → 100644

Show notes View .idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml 100644 → 0

Ignore Space Show notes View .idea/libraries/Gradle__nl_astraeus_very_simple_templates_1_4.xml 0 → 100644

Ignore Space Show notes View .idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml 0 → 100644

Ignore Space Show notes View .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_2_30.xml 0 → 100644

Show notes View .idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml 100644 → 0

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View .idea/modules/simple-database-kotlin.iml

Ignore Space Show notes View .idea/modules/simple-database-kotlin_main.iml

Ignore Space Show notes View .idea/modules/simple-database-kotlin_test.iml

Show notes View .idea/modules/simple_database_kotlin_main.iml 100644 → 0

Show notes View .idea/modules/simple_database_kotlin_test.iml 100644 → 0

Ignore Space Show notes View build.gradle

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.properties

Ignore Space Show notes View readme.md 0 → 100644

Ignore Space Show notes View simple-database-kotlin.ipr

Ignore Space Show notes View src/main/kotlin/nl/astraeus/database/Database.kt 0 → 100644

Ignore Space Show notes View src/main/kotlin/nl/astraeus/database/Queries.kt 0 → 100644

Ignore Space Show notes View src/test/kotlin/nl/astraeus/database/TestQueries.kt 0 → 100644

Ignore Space Show notes View src/test/kotlin/nl/astraeus/database/example/MinimalExample.kt 0 → 100644

Show notes View test/nl/astraeus/database/TestQueries.kt 100644 → 0

Show line notes below