fix merge conflict

Signed-off-by: Rahul Sharma <[email protected]>

Author: rahulait

deployments/gpu-operator/templates/cleanup_crd.yaml

@@ -35,7 +35,6 @@ spec:
           image: {{ include "gpu-operator.fullimage" . }}
           imagePullPolicy: {{ .Values.operator.imagePullPolicy }}
           command:
-<<<<<<< HEAD
           - sh
           - -c
           - >
@@ -47,15 +46,5 @@ spec:
               kubectl delete crd nodefeaturegroups.nfd.k8s-sigs.io --ignore-not-found=true;
               kubectl delete crd nodefeaturerules.nfd.k8s-sigs.io --ignore-not-found=true;
             {{- end }}
-=======
-            - /usr/bin/manage-crds
-          args:
-            - delete
-            - --filepath=/opt/gpu-operator/nvidia.com_clusterpolicies.yaml
-            - --filepath=/opt/gpu-operator/nvidia.com_nvidiadrivers.yaml
-        {{- if .Values.nfd.enabled }}
-            - --filepath=/opt/gpu-operator/nfd-api-crds.yaml
-        {{- end }}
->>>>>>> d834539c (fix minor issues with templates)
       restartPolicy: OnFailure
 {{- end }}