From 0029aee03683ea6be1893750b6c9e634a74fe9da Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Fri, 14 Sep 2012 16:42:48 -0400
Subject: [PATCH] Beginning JeromSar merge. Incrementing to v2.7

---
 .gitignore             | 2 ++
 appinfo.properties     | 5 -----
 buildnumber.properties | 3 ---
 src/plugin.yml         | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 appinfo.properties
 delete mode 100644 buildnumber.properties

diff --git a/.gitignore b/.gitignore
index b1ea751..abf4a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /nbproject/private/
 /dist/
 /build/
+appinfo.properties
+buildnumber.properties
diff --git a/appinfo.properties b/appinfo.properties
deleted file mode 100644
index 2f4aad7..0000000
--- a/appinfo.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu, 13 Sep 2012 19:16:42 -0400
-
-program.VERSION=2.6
-program.BUILDNUM=20
-program.BUILDDATE=09/13/2012 07\:16 PM
diff --git a/buildnumber.properties b/buildnumber.properties
deleted file mode 100644
index 802663f..0000000
--- a/buildnumber.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Build Number for ANT. Do not edit!
-#Thu Sep 13 19:16:42 EDT 2012
-build.number=21
diff --git a/src/plugin.yml b/src/plugin.yml
index 1c58565..5c2038b 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,8 +1,8 @@
 name: TotalFreedomMod
 main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
-version: 2.6
+version: 2.7
 description: Plugin for the Total Freedom server.
-author: StevenLawson / Madgeek1450
+authors: [StevenLawson / Madgeek1450, JeromSar / DarthSalamon]
 commands:
   cage:
     description: Superadmin command - Place a cage around someone.