diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-07-20 16:32:58 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-07-20 16:32:58 +0100 |
| commit | af80208ac5f9929bdfdf63f7806c6cc25ed0f77a (patch) | |
| tree | 7f5122e843bc567e99db3983be4f746069c97c3d /EssentialsSigns/src/net | |
| parent | c395997272b2ed5332029ec5199af6d0ec41c2d7 (diff) | |
| download | Essentials-af80208ac5f9929bdfdf63f7806c6cc25ed0f77a.tar Essentials-af80208ac5f9929bdfdf63f7806c6cc25ed0f77a.tar.gz Essentials-af80208ac5f9929bdfdf63f7806c6cc25ed0f77a.tar.lz Essentials-af80208ac5f9929bdfdf63f7806c6cc25ed0f77a.tar.xz Essentials-af80208ac5f9929bdfdf63f7806c6cc25ed0f77a.zip | |
Clear up merge leftovers
Diffstat (limited to 'EssentialsSigns/src/net')
| -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._; |