From ca19ab2abd66eea03cd8d0fec952bbf0548fef4c Mon Sep 17 00:00:00 2001
From: Raeschen <rycoop29@gmail.com>
Date: Tue, 13 Jun 2023 22:46:01 +0200
Subject: [PATCH] Fix a merge conflict

---
 config/jukebox.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/jukebox.json b/config/jukebox.json
index e50ef49715..7bea866c53 100644
--- a/config/jukebox.json
+++ b/config/jukebox.json
@@ -4698,11 +4698,8 @@
 "artist": "That Handsome Devil",
 "secret": false,
 "lobby": false,
-<<<<<<< HEAD
 "jukebox": true,
 "genre": "Rock"
-=======
-"jukebox": true
 },
 {
 "url": "https://files.catbox.moe/8r5d7q.mp3",
@@ -4713,7 +4710,6 @@
 "secret": true,
 "lobby": false,
 "jukebox": true
->>>>>>> ae542d5642... Merge pull request #14950 from Runa-Dacino/fixjukeboxjson
 },
 {
 "url": "https://files.catbox.moe/2ozzmg.m4a",