Fixed merge conflict

biermeester · Sep 5, 2013 · 4e2ca28 · 4e2ca28
2 parents 0dd8f8d + c9a1be5
commit 4e2ca28
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pylinter.py b/pylinter.py
@@ -338,7 +338,7 @@ def is_enabled(self):
 class PylintThread(threading.Thread):
     """ This class creates a seperate thread to run Pylint in """
     def __init__(self, view, pbin, ppath, cwd, lpath, lrc, ignore,
-                 disable_msgs):
+                 disable_msgs, extra_pylint_args):
         self.view = view
         # Grab the file name here, since view cannot be accessed
         # from anywhere but the main application thread
@@ -350,6 +350,7 @@ def __init__(self, view, pbin, ppath, cwd, lpath, lrc, ignore,
         self.pylint_rc = lrc
         self.ignore = ignore
         self.disable_msgs = disable_msgs
+        self.extra_pylint_args = extra_pylint_args
 
         threading.Thread.__init__(self)