Resolved conflicts

manjusha729 · manjusha729 · commit d7bf4c3249c8 · 2023-11-20T15:53:43.000+05:30
diff --git a/dev/tests/verification/Tests/SecretCredentialDataTest.php b/dev/tests/verification/Tests/SecretCredentialDataTest.php
@@ -21,7 +21,7 @@
 
 /**
  */
-class SecretCredentialDataTest
+class SecretCredentialDataTestCest
 {
     /**
      * @Features({"AdminNotification"})

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`*/`
`24`		`-class SecretCredentialDataTest`
	`24`	`+class SecretCredentialDataTestCest`
`25`	`25`	`{`
`26`	`26`	`/**`
`27`	`27`	`* @Features({"AdminNotification"})`