From 7ea2d6224a14f8509ae8a4d415dc539d1b26adc4 Mon Sep 17 00:00:00 2001
From: Charlie Wang <gibsticker@gmail.com>
Date: Sun, 30 Jun 2013 12:56:22 -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 39de769..e39db2d 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheep.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheep.java
@@ -29,8 +29,12 @@ public final class DiscoSheep extends JavaPlugin {
     }
     
     // Spawn some number of sheep next to given player
-    public void spawnSheep(Player player, Location loc, int num) {
+    public void spawnSheep(Player player, int num) {
+        Location loc;
         
+        for (int i = 0; i < num; i++) {
+            
+        }
     }
     
     // Mark all sheep in the sheep array for removal