From ca24b9073de03d9fd6e82cff29acda9667c95726 Mon Sep 17 00:00:00 2001
From: Charlie Wang <gibsticker@gmail.com>
Date: Sun, 30 Jun 2013 12:59:48 -0400
Subject: [PATCH] testing merge

---
 src/gibstick/bukkit/discosheep/DiscoSheep.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gibstick/bukkit/discosheep/DiscoSheep.java b/src/gibstick/bukkit/discosheep/DiscoSheep.java
index e39db2d..f2d5681 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheep.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheep.java
@@ -33,8 +33,12 @@ public final class DiscoSheep extends JavaPlugin {
         Location loc;
         
         for (int i = 0; i < num; i++) {
-            
+            loc = null;
         }
+        
+        /// change
+        /// change
+        /// change
     }
     
     // Mark all sheep in the sheep array for removal