Resolve merge conflict in arrmatey compose

Author: ironicbadger

services/c137/03-arrmatey/compose.yaml

@@ -148,3 +148,10 @@ services:
       - "PGID={{ docker_compose_generator_gid }}"
       - "TZ={{ host_timezone }}"
     restart: unless-stopped
+  sponsorblock:
+    image: ghcr.io/dmunozv04/isponsorblocktv
+    container_name: sponsorblock
+    network_mode: host
+    volumes:
+      - "{{ appdata_path }}/arrmatey/isponsorblocktv:/app/data"
+    restart: unless-stopped

services/c137/03-arrmatey/config-isponsorblocktv/.dest

@@ -0,0 +1 @@
+{{ appdata_path }}/arrmatey/isponsorblocktv

services/c137/03-arrmatey/config-isponsorblocktv/config.json

@@ -0,0 +1,22 @@
+{
+    "devices": [
+        {
+            "screen_id": "586m0028ggrck0117vs5k5ubu4",
+            "name": "YouTube on TV"
+        }
+    ],
+    "apikey": "",
+    "skip_categories": [
+        "sponsor",
+        "selfpromo",
+        "exclusive_access"
+    ],
+    "channel_whitelist": [],
+    "skip_count_tracking": true,
+    "mute_ads": true,
+    "skip_ads": true,
+    "minimum_skip_length": 5,
+    "auto_play": false,
+    "join_name": "iSponsorBlockTV",
+    "use_proxy": true
+}