testing merge

2013-06-30 12:59:48 -04:00 · 2013-06-30 12:59:48 -04:00 · ca24b9073d
commit ca24b9073d
parent 7ea2d6224a
1 changed files with 5 additions and 1 deletions
--- 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