cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a merge conflict

Browse Source
This commit is contained in:
Raeschen
2023-06-13 22:46:01 +02:00
committed by GitHub
parent 426f253fae
commit ca19ab2abd
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/jukebox.json
View File

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