resolve merge conflict

2024-01-06 16:49:41 +05:30
parent 8fb504098f 039e17a3b8
commit 3f47213d95
16 changed files with 1042 additions and 189 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
        applicationId "in.sminnovations.hpostesting.quality"
        minSdk 21
        targetSdk 34
-        versionCode 56
-        versionName "2.1.56"
+        versionCode 68
+        versionName "2.1.68"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }