From 12374d9c17e7ae7e278e605ec5feaf9566e078da Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Wed, 26 Aug 2015 19:06:20 +0100
Subject: [PATCH] [no ci] Minimizing unneeded changes

---
 .gitattributes | 1 -
 config.gcfg    | 2 +-
 strings.go     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 73ec672..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-README.md merge=ours
\ No newline at end of file
diff --git a/config.gcfg b/config.gcfg
index c55e52c..db67c05 100644
--- a/config.gcfg
+++ b/config.gcfg
@@ -140,7 +140,7 @@ AdminsEnabled = true
 # 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
 # be entered in this matter.
-Admins = "BottleOToast"
+Admins = "Matt"
 
 # Make add an admin command?
 # DEFAULT VALUE: false
diff --git a/strings.go b/strings.go
index be2c4f7..d48e7a7 100644
--- a/strings.go
+++ b/strings.go
@@ -169,4 +169,4 @@ const CURRENT_SONG_HTML = `
 // playlist is playing.
 const CURRENT_SONG_PLAYLIST_HTML = `
 	The song currently playing is "%s", added <b>%s</b> from the playlist "%s".
-`
\ No newline at end of file
+`