Merge remote branch 'upstream/master'

2011-11-26 16:57:38 -06:00 · 2011-11-26 16:57:38 -06:00 · 97f5d0c715
commit 97f5d0c715
parent ddfcb26686 609d0e5c60
1 changed files with 1 additions and 1 deletions
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@ -190,4 +190,4 @@ permissions:
  dynmap.marker.deletearea:
    description: Allows /dmarker deletearea
    default: op
-    
+