Remove clutter

2021-04-29 11:26:15 +02:00
parent 3fa7f9e930
commit 91451e2fd5
7 changed files with 7 additions and 45 deletions
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@ -36,12 +36,7 @@ services:
    volumes:
      - ${NEXTCLOUD_ROOT}/redis:/data
      - /etc/localtime:/etc/localtime:ro
-<<<<<<< HEAD
-      - /etc/timezone:/etc/timezone:ro      
-=======
      - /etc/timezone:/etc/timezone:ro
-      
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3

  nextcloud-app:
    depends_on:
@ -151,5 +146,3 @@ services:
      - /etc/localtime:/etc/localtime:ro
      - /etc/timezone:/etc/timezone:ro
      - ./collabora/loolwsd.xml:/etc/loolwsd/loolwsd.xml
-  
-  
--- a/nextcloud/mariadb-conf/docker.cnf
+++ b/nextcloud/mariadb-conf/docker.cnf
@ -3,8 +3,4 @@ innodb_buffer_pool_size=2G
 innodb_io_capacity=4000
 innodb_io_capacity_max=4000
 skip-host-cache
-<<<<<<< HEAD
 skip-name-resolve
-=======
-skip-name-resolve
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3