AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
Robinson Gallego 2019-11-03 18:25:12 -05:00
parent fe2bdef026
commit 4a69f529c2
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/config.yml
View File

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