Skip to content

Commit

Permalink
Final update fix that I delayed so I wouldn't get a merge conflict wi…
Browse files Browse the repository at this point in the history
…th aufdemrand. :p
  • Loading branch information
davidcernat committed Jul 2, 2013
1 parent 5bd3757 commit ebb33be
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/objects/dNPC.java
Expand Up @@ -20,10 +20,10 @@
import net.citizensnpcs.api.trait.trait.Owner;
import net.citizensnpcs.trait.Anchors;
import net.citizensnpcs.util.Anchor;
import net.minecraft.server.v1_5_R3.EntityLiving;
import net.minecraft.server.v1_6_R1.EntityLiving;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
Expand Down

0 comments on commit ebb33be

Please sign in to comment.