This commit is contained in:
Robinson Gallego 2019-11-03 18:25:12 -05:00
parent fe2bdef026
commit 4a69f529c2

View File

@ -57,15 +57,12 @@ discord:
telnet_role_id: ''
# Senior Admin role ID
senior_role_id: ''
<<<<<<< HEAD
# Developer role ID
developer_role_id: ''
# Executive Admin role ID
executive_role_id: ''
# Owner role ID
server_owner_role_id: ''
=======
# The shop
shop:
@ -74,7 +71,6 @@ shop:
# Shop prefix
prefix: '&7&l[&8&lTF Shop&7&l]'
>>>>>>> d582398f932330853b0456b684654da4c860e831
# Admin list
adminlist:
@ -127,11 +123,8 @@ allow:
unsafe_enchantments: true
bells: true
armorstands: false
<<<<<<< HEAD
minecarts: false
=======
clearonjoin: false
>>>>>>> d582398f932330853b0456b684654da4c860e831
# Blocked commands:
#