Merge branch 'master' of https://github.com/yRicardinBaum/JDA-Command

yRicardinBaum · Dec 25, 2021 · 606f21e · 606f21e
2 parents 78d5c6a + 440278b
commit 606f21e
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/src/test/java/TestMain.java b/src/test/java/TestMain.java
@@ -7,21 +7,9 @@ public class TestMain {
     public static JDA bot;
     public static RiCommand settings;
 
-<<<<<<< HEAD
+
     public static void main(String[] args) throws LoginException {
-        JDABuilder builder = JDABuilder.createDefault("ODk0MzI1MjU2MDU4MTk2MDQw.YVoXTA.FVZx8zfUaIGZui8zvFIf59pV8nU");
-=======
-    public static void main(String[] args) throws LoginException, InterruptedException {
-        JDABuilder builder = JDABuilder.createDefault("TOKEN")
-                .setBulkDeleteSplittingEnabled(false)
-                .disableCache(CacheFlag.ACTIVITY)
-                .setMemberCachePolicy(MemberCachePolicy.VOICE.or(MemberCachePolicy.OWNER))
-                .setChunkingFilter(ChunkingFilter.NONE)
-                .disableIntents(GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_MESSAGE_TYPING)
-                .setCompression(Compression.NONE)
-                .setAutoReconnect(true)
-                .setLargeThreshold(50);
->>>>>>> 6688290a9ab1ec002b57a813011a16b35fd72dac
+        JDABuilder builder = JDABuilder.createDefault("TOKEN");
         bot = builder.build();
         RiCommand cmds = new RiCommand(bot, "ri!");
         cmds.addCommand(new CommandTest());