Merge remote changes and resolve conflict
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
name: sdf1
|
||||
version: 1.3
|
||||
version: 1.4
|
||||
author: Sdf1_team
|
||||
main: com.sdf1.Main
|
||||
api-version: 1.21
|
||||
@@ -20,4 +20,4 @@ permissions:
|
||||
default: true
|
||||
sdf1.admin:
|
||||
description: 管理员权限(reload/update)
|
||||
default: op
|
||||
default: op
|
||||
Reference in New Issue
Block a user