diff options
Diffstat (limited to 'EssentialsSigns')
| -rw-r--r-- | EssentialsSigns/src/net/ess3/signs/EssentialsSign.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 272f14252..59c733981 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -1,4 +1,8 @@ +<<<<<<< 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._; |