[no ci] Minimizing unneeded changes

This commit is contained in:
MichaelOultram 2015-08-26 19:06:20 +01:00
parent 4672e843fe
commit 12374d9c17
3 changed files with 2 additions and 3 deletions

1
.gitattributes vendored
View file

@ -1 +0,0 @@
README.md merge=ours

View file

@ -140,7 +140,7 @@ AdminsEnabled = true
# SYNTAX: In order to specify multiple admins, repeat the Admins="username" # SYNTAX: In order to specify multiple admins, repeat the Admins="username"
# line of code. Each line has one username, and an unlimited amount of usernames may # line of code. Each line has one username, and an unlimited amount of usernames may
# be entered in this matter. # be entered in this matter.
Admins = "BottleOToast" Admins = "Matt"
# Make add an admin command? # Make add an admin command?
# DEFAULT VALUE: false # DEFAULT VALUE: false

View file

@ -169,4 +169,4 @@ const CURRENT_SONG_HTML = `
// playlist is playing. // playlist is playing.
const CURRENT_SONG_PLAYLIST_HTML = ` const CURRENT_SONG_PLAYLIST_HTML = `
The song currently playing is "%s", added <b>%s</b> from the playlist "%s". The song currently playing is "%s", added <b>%s</b> from the playlist "%s".
` `