AirDog46/MusicBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source 
also minor edits
Conflicts:
	pom.xml
This commit is contained in:
John Grosh
2019-05-29 22:26:51 -04:00
parent 3c5deca55e c902c1eace
commit b4e83fd3f0
9 changed files with 106 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/jagrosh/jmusicbot/BotConfig.java
View File

@@ -20,9 +20,7 @@ import com.jagrosh.jmusicbot.utils.FormatUtil;
import com.jagrosh.jmusicbot.utils.OtherUtil;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.typesafe.config.*;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;