From 2bd519911bbd44da45329e4aa7d3b53ac9136202 Mon Sep 17 00:00:00 2001
From: neeharikatech <76684248+neeharikatech@users.noreply.github.com>
Date: Mon, 9 Oct 2023 10:49:07 +0530
Subject: [PATCH] Update TestData.json

Signed-off-by: neeharikatech <76684248+neeharikatech@users.noreply.github.com>
---
 injitest/src/main/resources/TestData.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/injitest/src/main/resources/TestData.json b/injitest/src/main/resources/TestData.json
index 73ec85ee61..d1c2f3a106 100644
--- 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"
 }