cslrfid
diff --git a/‎.idea/caches/build_file_checksums.ser
0 Bytes b/‎.idea/caches/build_file_checksums.ser
0 Bytes
diff --git a/‎app/build.gradle
Lines changed: 4 additions & 0 deletions b/‎app/build.gradle
Lines changed: 4 additions & 0 deletions
@@ -6,7 +6,11 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 30
+<<<<<<< HEAD
         versionCode 32
+=======
+        versionCode 31
+>>>>>>> cef18819032d4ed422d5ace1b1c2071a33aedab8
         versionName "2.2.0"
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@ android {`
`6`	`6`	`applicationId "com.csl.cs108ademoapp"`
`7`	`7`	`minSdkVersion 19`
`8`	`8`	`targetSdkVersion 30`
	`9`	`+<<<<<<< HEAD`
`9`	`10`	`versionCode 32`
	`11`	`+=======`
	`12`	`+ versionCode 31`
	`13`	`+>>>>>>> cef18819032d4ed422d5ace1b1c2071a33aedab8`
`10`	`14`	`versionName "2.2.0"`
`11`	`15`	`}`
`12`	`16`	`}`