From 4acb695bfa59eeb36fd2c84dbc05e36056f80fa8 Mon Sep 17 00:00:00 2001
From: RangerMauve <RangerMauve@hotmail.com>
Date: Sun, 30 Jun 2013 12:55:53 -0400
Subject: [PATCH] Testing out merging

---
 src/gibstick/bukkit/discosheep/DiscoSheep.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gibstick/bukkit/discosheep/DiscoSheep.java b/src/gibstick/bukkit/discosheep/DiscoSheep.java
index 39de769..5bd82bb 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheep.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheep.java
@@ -19,6 +19,7 @@ public final class DiscoSheep extends JavaPlugin {
 
     @Override
     public void onDisable() {
+		// Watashi Wa Kawaii, Ne?
     }
 
     public void spawnSheep(World world, Location loc) {