Resolve a conflict #13664 #13666 #13668

Author: michaelklishin

selenium/short-suite-management-ui

@@ -1,11 +1,8 @@
 authnz-mgt/basic-auth.sh
 authnz-mgt/oauth-with-keycloak.sh
-<<<<<<< HEAD
-=======
 authnz-mgt/basic-auth-with-mgt-prefix.sh
 authnz-mgt/oauth-with-uaa.sh
 authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix.sh
->>>>>>> 63d95f89f (Test management custom path on each commit to PRs)
 mgt/vhosts.sh
 mgt/exchanges.sh
 mgt/limits.sh