diff options
| -rw-r--r-- | EssentialsSigns/src/net/ess3/signs/EssentialsSign.java | 5 |
1 files changed, 1 insertions, 4 deletions
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._; |