minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-14 10:34:41 +02:00
Code Issues Releases Wiki Activity

Clear up merge leftovers

Browse Source
This commit is contained in:
ementalo
2012-07-20 16:32:58 +01:00
parent c395997272
commit af80208ac5
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
View File

@@ -1,8 +1,5 @@
<<<<<<< HEAD:EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
package com.earth2me.essentials.signs;
=======
package net.ess3.signs; package net.ess3.signs;
>>>>>>> master:EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
import net.ess3.api.ChargeException; import net.ess3.api.ChargeException;
import static net.ess3.I18n._; import static net.ess3.I18n._;