mirror of
https://github.com/hmalik144/Farmr.git
synced 2026-03-18 07:25:55 +00:00
Merge branch 'master' into navigation_implementation
# Conflicts: # app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentAddItem.kt # app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt # app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt # app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt
This commit is contained in:
@@ -14,8 +14,8 @@ android {
|
||||
applicationId "com.appttude.h_mal.farmr"
|
||||
minSdkVersion MIN_SDK_VERSION
|
||||
targetSdkVersion TARGET_SDK_VERSION
|
||||
versionCode 3
|
||||
versionName "2.1"
|
||||
versionCode 5
|
||||
versionName "2.3"
|
||||
testInstrumentationRunner 'com.appttude.h_mal.farmr.application.TestRunner'
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user