From 3173c62cc560780b77811ac50675c1ab99a25b92 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Wed, 2 Nov 2016 17:42:23 +0100
Subject: [PATCH] Fixed error...

---
 src/main/java/buttondevteam/lib/TBMCPlayer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/buttondevteam/lib/TBMCPlayer.java b/src/main/java/buttondevteam/lib/TBMCPlayer.java
index 677d1b9..0390a83 100644
--- 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;