Fixed error...

2016-11-02 17:42:23 +01:00 · 2016-11-02 17:42:23 +01:00 · 3173c62cc5
parent d2a3991abb
commit 3173c62cc5
1 changed files with 0 additions and 1 deletions
--- a/src/main/java/buttondevteam/lib/TBMCPlayer.java
+++ b/src/main/java/buttondevteam/lib/TBMCPlayer.java
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package buttondevteam.lib;

 import java.io.File;