Merge Conflicts

This commit is contained in:
Cooldude2606 committed 2019-01-11 22:34:47 +00:00
commit 6f100e81f2
400 files changed
+22150 -3813

No files matched your search

-17
View File
@@ -1,17 +0,0 @@
--[[
Explosive Gaming
This file can be used with permission but this and the credit below must remain in the file.
Contact a member of management on our discord to seek permission to use our code.
Any changes that you may make to the code are yours but that does not make the script yours.
Discord: https://discord.gg/r6dC2uK
]]
--Please Only Edit Below This Line-----------------------------------------------------------
-- this file will just contain all the diffrent requires
require('colours')
require('health')
require('spawn')
require('starting-items')
require('paths')
require('body-marker')
require('chat-popup')