Merge pull request #32 from PublicisSapient/resolved-conflict

aksshriv1 · web-flow · commit 2d2bc147f817 · 2025-05-27T11:29:43.000+05:30
Reverse sync qa-master to master
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Global rule:
-* @brahmanand1 @spal-sapient @aksshriv1 @shunaray @kunkambl @mampacch @nagendra-battala @Chittauri @gipathak @risshukl0 @ananthpal @manoj-srivastava
+* @Chittauri @gipathak @ananthpal @manoj-srivastava @aksshriv1 @vladinu
diff --git a/.gitignore b/.gitignore
@@ -209,4 +209,4 @@ testem.log
 Thumbs.db
 package-lock.json
 
-.github/CODEOWNERS
+.github/CODEOWNERS
diff --git a/jira-zephyr-scale/src/main/java/com/publicissapient/kpidashboard/zephyr/processor/service/impl/ZephyrCloudImpl.java b/jira-zephyr-scale/src/main/java/com/publicissapient/kpidashboard/zephyr/processor/service/impl/ZephyrCloudImpl.java

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Global rule:`
`2`		`-* @brahmanand1 @spal-sapient @aksshriv1 @shunaray @kunkambl @mampacch @nagendra-battala @Chittauri @gipathak @risshukl0 @ananthpal @manoj-srivastava`
	`2`	`+* @Chittauri @gipathak @ananthpal @manoj-srivastava @aksshriv1 @vladinu`