resolve merge conflicts
This commit is contained in:
@@ -106,7 +106,7 @@ dependencies {
|
||||
implementation "androidx.fragment:fragment-ktx:1.6.2"
|
||||
|
||||
// CSV read, write
|
||||
implementation 'com.opencsv:opencsv:5.5'
|
||||
implementation 'com.opencsv:opencsv:5.9'
|
||||
|
||||
// Barcode scanner
|
||||
implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
|
||||
|
||||
Reference in New Issue
Block a user