Fix conflits

MahdiyarGHD · Apr 6, 2023 · adf17fd · adf17fd
1 parent 800af2d
commit adf17fd
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/resources/config.php b/resources/config.php
@@ -1,14 +1,8 @@
 <?php
 
-<<<<<<< HEAD
-define('BOT_TOKEN', '// Bot Token');
-define('BOT_ID', '// Bot ID');
-define('CHAT_ID', []);
-define('OWNER_ID', 1234567);
-=======
+
 define('BOT_TOKEN', 'Bot Token');
 define('BOT_ID', 'Bot ID');
 define('CHAT_ID', []);
-define('OWNER_ID', 1234);
->>>>>>> c83ce6b (Revert missing dependencies)
+define('OWNER_ID', 12345678);
 define('DEBUG_MODE', true);