Merge remote-tracking branch 'origin/master'

Fork: 0

rnentjes / simple-database

Browse code Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/misc.xml # simple-database.iml master simple
commit 37b6d3223885d49402d5518d9e88958a6b74a4a3 2 parents 67926e3 + 158f62d rnentjes authored on 28 Dec 2015

Patch

Unified Split

Showing 6 changed files

Show notes View .idea/ant.xml 100644 → 0

Ignore Space Show notes View .idea/compiler.xml

Ignore Space Show notes View .idea/encodings.xml

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

Show notes View .idea/scopes/scope_settings.xml 100644 → 0

Show notes View .idea/uiDesigner.xml 100644 → 0

Show line notes below