Update Chart.yaml

Author: pierluigilenoci

helm/oauth2-proxy/Chart.yaml

@@ -35,8 +35,4 @@ annotations:
       description: Fix deployment nodeSelector rendering in template
       links:
         - name: Github PR
-<<<<<<< HEAD
-          url: https://github.com/oauth2-proxy/manifests/pull/312
-=======
           url: https://github.com/oauth2-proxy/manifests/pull/305
->>>>>>> ac87471 (Update Chart.yaml with changes)