From d51726605d2785ecf4d9607328ebb71a8d066602 Mon Sep 17 00:00:00 2001
From: inpos <inpos@yandex.ru>
Date: Sun, 20 Mar 2016 13:49:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Inposloader.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Inposloader.py b/Inposloader.py
index 8fbde21..2db5ece 100644
--- a/Inposloader.py
+++ b/Inposloader.py
@@ -248,15 +248,9 @@ class InposPlayer(xbmc.Player):
         try:
             self.engine.start()
             self.setup_nextep()
-<<<<<<< HEAD
-            while True:
-                self.engine.activate_file(self.contentId)
-                if self.buffer():
-=======
             self.engine.activate_file(self.contentId)
             if self.buffer():
                 while True:
->>>>>>> 337de1c95f0872a9223a8008698caf9099137ff7
                     log('['+author+'Player]: ************************************* GOING LOOP')
                     if self.setup_play():
                         self.setup_subs()