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/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