Update TestData.json

Signed-off-by: neeharikatech <[email protected]>
mosip · Oct 9, 2023 · 2bd5199 · 2bd5199
1 parent 62a54ca
commit 2bd5199
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/injitest/src/main/resources/TestData.json b/injitest/src/main/resources/TestData.json
@@ -8,11 +8,7 @@
   "status": "Valid",
   "generatedOn": "9/5/2023",
   "aid": "10001100660000620230714065538",
-<<<<<<< HEAD
   "setExcludedGroups":"AVT,PVT",
-=======
-  "setExcludedGroups":"AVT",
->>>>>>> upstream/develop
   "androidAppPath":"D:/GITINJI/inji/injitest/apps/android/Inji_latest.apk",
   "androidDevice": "Pixel_6a_API_30"
 }