Fix everything

workloads/nextcloud/nextcloud-deploy.yml

@@ -17,50 +17,6 @@ spec:
         app: nextcloud
     spec:
       containers:
-<<<<<<< HEAD
-        - image: nextcloud:17.0.3-apache
-          imagePullPolicy: IfNotPresent
-          name: nextcloud
-          env:
-            - name: POSTGRES_DB
-              value: nextcloud
-            - name: POSTGRES_HOST
-              value: postgres:5432
-            - name: POSTGRES_USER
-              valueFrom:
-                secretKeyRef:
-                  name: postgres
-                  key: POSTGRES_USER
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: postgres
-                  key: POSTGRES_PASSWORD
-            - name: REDIS_HOST
-              value: redis
-            - name: REDIS_HOST_PORT
-              value: "6379"
-          resources:
-            requests:
-              memory: "1024Mi"
-              cpu: "100m"
-            limits:
-              memory: "4096Mi"
-          livenessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 600
-            periodSeconds: 30
-            timeoutSeconds: 5
-            successThreshold: 1
-            failureThreshold: 2
-          ports:
-            - containerPort: 80
-          volumeMounts:
-            - name: nextcloud-data
-              mountPath: /var/www/html
-      volumes:
-=======
       - image: nextcloud:18.0.1-apache
         imagePullPolicy: IfNotPresent
         name: nextcloud
@@ -100,7 +56,6 @@ spec:
         ports:
         - containerPort: 80
         volumeMounts:
->>>>>>> 0f8184907bd84f04faf5546e9dfea5d04ad20df7
         - name: nextcloud-data
           mountPath: /var/www/html
       volumes: