Fixed Conflicted issues.

This commit is contained in:
Christopher Darnell committed 2021-04-26 08:10:12 -07:00
commit e7a882724b
7 files changed
+145 -28

No files matched your search

-3
View File
@@ -2,19 +2,16 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using DSharpPlus;
using DSharpPlus.CommandsNext;
using DSharpPlus.CommandsNext.Exceptions;
using DSharpPlus.Entities;
using DSharpPlus.EventArgs;
using DSharpPlus.Interactivity;
using DSharpPlus.Interactivity.Enums;
using DSharpPlus.Interactivity.Extensions;
using DSharpPlus.VoiceNext;
using DSharpPlus.VoiceNext.Codec;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;