add compat

2019-11-24 15:11:29 +01:00 · 2019-11-24 15:11:29 +01:00 · 8b7ef18c00
commit 8b7ef18c00
parent 626716f94e
1 changed files with 1 additions and 5 deletions
--- a/server.yml
+++ b/server.yml
@ -24,10 +24,6 @@
  - tt-rss
  - gitea
  - supysonic
-<<<<<<< HEAD
-  - user_config
-=======
  - chainetv
-
->>>>>>> master
+  - user_config