merge fixes

This commit is contained in:
Light2
2014-05-01 21:27:16 +02:00
parent 6cd794a6c3
commit ce55d15e97
4 changed files with 20 additions and 23 deletions
@@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.objects.deed.Player_House_Deed;
import resources.objects.tangible.TangibleObject;
import services.sui.SUIWindow;
import services.sui.SUIWindow.SUICallback;