Python rebase conflict fixing

medusa/server/web/home/handler.py

@@ -1553,20 +1553,20 @@ def setStatus(self, showSlug=None, eps=None, status=None):
         # @TODO: Merge this with the other PUT commands for /api/v2/show/{id}
         if not all([showSlug, eps, status]):
             error_message = 'You must specify a show and at least one episode'
-                ui.notifications.error('Error', error_message)
-                return json.dumps({
-                    'result': 'error',
-                'message': error_message
-                })
+            ui.notifications.error('Error', error_message)
+            return json.dumps({
+                'result': 'error',
+            'message': error_message
+            })
 
         status = int(status)
         if status not in statusStrings:
             error_message = 'Invalid status'
-                ui.notifications.error('Error', error_message)
-                return json.dumps({
-                    'result': 'error',
-                'message': error_message
-                })
+            ui.notifications.error('Error', error_message)
+            return json.dumps({
+                'result': 'error',
+            'message': error_message
+            })
 
         identifier = SeriesIdentifier.from_slug(showSlug)
         if not identifier:
@@ -1580,16 +1580,16 @@ def setStatus(self, showSlug=None, eps=None, status=None):
         series_obj = Series.find_by_identifier(identifier)
         if not series_obj:
             error_message = 'Error', 'Show not in show list'
-                ui.notifications.error('Error', error_message)
-                return json.dumps({
-                    'result': 'error',
-                'message': error_message
-                })
+            ui.notifications.error('Error', error_message)
+            return json.dumps({
+                'result': 'error',
+            'message': error_message
+            })
 
         segments = {}
         trakt_data = []
-        if eps:
 
+        if eps:
             sql_l = []
             for cur_ep in eps.split('|'):
 
@@ -1718,10 +1718,10 @@ def setStatus(self, showSlug=None, eps=None, status=None):
             if segments:
                 ui.notifications.message('Retry Search started', msg)
 
-            return json.dumps({
-                'result': 'success',
+        return json.dumps({
+            'result': 'success',
             'message': ''
-            })
+        })
 
     def testRename(self, indexername=None, seriesid=None):
         if not indexername or not seriesid:

themes-default/slim/src/components/subtitle-search.vue

@@ -224,9 +224,9 @@ export default {
         },
         close() {
             this.$emit('close', this);
-            // destroy the vue listeners, etc
+            // Destroy the vue listeners, etc
             this.$destroy();
-            // remove the element from the DOM
+            // Remove the element from the DOM
             this.$el.parentNode.removeChild(this.$el);
         }
     }