resolve merge conflict

MycroftAI · Aug 17, 2021 · 109e8ca · 109e8ca
1 parent 9c38020
commit 109e8ca
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/mycroft/skills/common_play_skill.py b/mycroft/skills/common_play_skill.py
@@ -171,13 +171,9 @@ def __handle_play_start(self, message):
         # "... on the chromecast"
         self.play_service_string = phrase
 
-<<<<<<< HEAD
         self.bus.emit(Message('active_skill_request', {
-                'skill_id': self.skill_id, 
+                'skill_id': self.skill_id,
                 'skill_cat': self.skill_control.category}))
-=======
-        self.make_active()
->>>>>>> 170ebc44ecf5cf3ceeaf44f282c992754b1bbc1b
 
         # Invoke derived class to provide playback data
         self.CPS_start(phrase, data)