From af80208ac5f9929bdfdf63f7806c6cc25ed0f77a Mon Sep 17 00:00:00 2001 From: ementalo Date: Fri, 20 Jul 2012 16:32:58 +0100 Subject: Clear up merge leftovers --- EssentialsSigns/src/net/ess3/signs/EssentialsSign.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'EssentialsSigns/src/net') diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 1c0505821..3a9f9f903 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -1,8 +1,5 @@ -<<<<<<< HEAD:EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java -package com.earth2me.essentials.signs; -======= package net.ess3.signs; ->>>>>>> master:EssentialsSigns/src/net/ess3/signs/EssentialsSign.java + import net.ess3.api.ChargeException; import static net.ess3.I18n._; -- cgit v1.2.3