Merge remote-tracking branch 'origin/simple' into simple

Fork: 0

rnentjes / simple-database-kotlin

Browse code Merge remote-tracking branch 'origin/simple' into simple # Conflicts: # build.gradle master simple
commit 435e3878e7d9e189fc6318787811a2150665a9c3 2 parents e1b2f67 + 91a988a rnentjes authored on 3 Mar 2018

Patch

Unified Split

Showing 3 changed files

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 simple-database-kotlin.ipr

Show line notes below