diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-12-01 13:47:06 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-12-01 13:47:06 +0000 |
commit | f0069326393cc145c0fd21e002a8eaac1a9681d8 (patch) | |
tree | 5a22fd2e93ef9a85643e1da860a91dab493e2468 /EssentialsPermissionsCommands/manifest.mf | |
parent | 2dc6f8c20236dfa76b09bd4bd9e522cd0d1c354b (diff) | |
parent | 39851694ad9e55e425ff7cb03c05cdb70a16f5a4 (diff) | |
download | Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.gz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.lz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.xz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.zip |
Merge branch 'master' of github.com:essentials/Essentials
Conflicts:
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
Diffstat (limited to 'EssentialsPermissionsCommands/manifest.mf')
-rw-r--r-- | EssentialsPermissionsCommands/manifest.mf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/EssentialsPermissionsCommands/manifest.mf b/EssentialsPermissionsCommands/manifest.mf deleted file mode 100644 index 328e8e5bc..000000000 --- a/EssentialsPermissionsCommands/manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -X-COMMENT: Main-Class will be added automatically by build - |