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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-08-27 18:28:13 -04:00
committed by GitHub
parent 3c7fa05f6c
commit a8e4fb9d00
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/example/config.txt
View File

@@ -587,12 +587,6 @@ DEFIB_TIMER 60
# REQUIRED: url (str), title (str), duration (num, in DS)
# SUGGESTED: artist (str), genre (str)
# OPTIONAL: secret (bool), lobby (bool)
<<<<<<< HEAD
#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json
||||||| parent of ceb722ae02... Merge pull request #11511 from VOREStation/Arokha/versionhell
#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json
JUKEBOX_TRACK_FILES config/jukebox.json
=======
#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json
JUKEBOX_TRACK_FILES config/jukebox.json
@@ -600,4 +594,3 @@ JUKEBOX_TRACK_FILES config/jukebox.json
#SUGGESTED_BYOND_VERSION 514
# Suggested BYOND client build (minor component, e.g. 1560)
#SUGGESTED_BYOND_BUILD 1561
>>>>>>> ceb722ae02... Merge pull request #11511 from VOREStation/Arokha/versionhell