resolved conflicts

ragavareddychalapala · ragavareddychalapala · commit f0c9717c7714 · 2024-02-13T15:03:32.000+05:30
diff --git a/src/LCT.Common/appSettings.json b/src/LCT.Common/appSettings.json
@@ -5,7 +5,7 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 {
-  "CaVersion": "6.0.3",
+  "CaVersion": "6.0.2",
   "TimeOut": 200,
   "ProjectType": "<Insert ProjectType>",
   "SW360ProjectName": "<Insert SW360 Project Name>",

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`// --------------------------------------------------------------------------------------------------------------------`
`6`	`6`
`7`	`7`	`{`
`8`		`- "CaVersion": "6.0.3",`
	`8`	`+ "CaVersion": "6.0.2",`
`9`	`9`	`"TimeOut": 200,`
`10`	`10`	`"ProjectType": "<Insert ProjectType>",`
`11`	`11`	`"SW360ProjectName": "<Insert SW360 Project Name>",`