# Conflicts:
#   app/src/main/AndroidManifest.xml
#   app/src/main/java/com/example/bondoman/MainActivity.kt
#   app/src/main/res/values/strings.xml

Crud

See merge request !5

# Conflicts:
#   .idea/deploymentTargetDropDown.xml
#   app/build.gradle.kts
#   app/src/main/AndroidManifest.xml
#   app/src/main/java/com/example/bondoman/ContainerActivity.kt
#   app/src/main/java/com/example/bondoman/TransactionFragment.kt
#   app/src/main/java/com/example/bondoman/retrofit/adapter/TransactionAdapter.kt
#   app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
#   app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt
#   app/src/main/res/values/strings.xml

Transaksi

See merge request !4

# Conflicts:
#   app/build.gradle.kts
#   app/src/main/AndroidManifest.xml
#   app/src/main/res/values/strings.xml

Master

See merge request !2