mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-27 01:05:38 +00:00
ok
This commit is contained in:
parent
fe2bdef026
commit
4a69f529c2
@ -57,7 +57,6 @@ discord:
|
||||
telnet_role_id: ''
|
||||
# Senior Admin role ID
|
||||
senior_role_id: ''
|
||||
<<<<<<< HEAD
|
||||
# Developer role ID
|
||||
developer_role_id: ''
|
||||
# Executive Admin role ID
|
||||
@ -65,8 +64,6 @@ discord:
|
||||
# Owner role ID
|
||||
server_owner_role_id: ''
|
||||
|
||||
=======
|
||||
|
||||
# The shop
|
||||
shop:
|
||||
# Enable the 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:
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user