Завершение слияния

2016-03-20 13:49:26 +03:00 · 2016-03-20 13:49:26 +03:00 · d51726605d
parent 6aea5b27e3
commit d51726605d
1 changed files with 0 additions and 6 deletions
--- 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()