resolve conflicts

Author: ishangulhane

config/adapter/adapter.appidentityandaccessadapter.config.pb.html

@@ -16,4 +16,3 @@
 protect your APIs and containerized web apps. Without any change to your code or the need to redeploy
 your app, you can enforce authentication and authorization policies in all of your environments.
 To get started with sample configurations see the <a href="https://cloud.ibm.com/docs/services/appid?topic=appid-istio-adapter">docs</a>.</p>
-

config/adapter/appidentityandaccessadapter.yaml

@@ -6,7 +6,7 @@ metadata:
   name: appidentityandaccessadapter
   namespace: istio-system
 spec:
-  description: 
+  description:
   session_based: false
   templates:
   - authnZ

config/adapter/config.proto_descriptor

@@ -5,6 +5,6 @@ metadata:
   namespace: sample-app
 spec:
   authMethod:   client_secret_basic
-  discoveryUrl: https://us-south.appid.cloud.ibm.com/oauth/v4/<tenant-ID>/oidc-discovery/.well-known
+  discoveryUrl: https://us-south.appid.cloud.ibm.com/oauth/v4/<tenant_id>/.well-known/openid-configuration
   clientId:     <client-id>
-  clientSecret: <client-secret>
+  clientSecret: <client-secret>