Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	sublime_files.py
  • Loading branch information...
2 parents e80f202 + 990b7d1 commit 695f3d6b2c436695a17277a9eaaacc8bfc17aefc @s-trooper committed
Showing with 7 additions and 1 deletion.
  1. +7 −1 sublime_files.py
  2. BIN sublime_files.pyc
View
8 sublime_files.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
import sublime
import sublime_plugin
import os
@@ -5,6 +6,11 @@
import subprocess
import shlex
import fnmatch
+=======
+import sublime, sublime_plugin
+import os, sys, glob
+import shlex
+>>>>>>> upstream/master
from subprocess import Popen
@@ -175,4 +181,4 @@ def get_sublime_path():
def sublime_command_line(args):
args.insert(0, get_sublime_path())
- return subprocess.Popen(args)
+ return Popen(args)
View
BIN sublime_files.pyc
Binary file not shown.

0 comments on commit 695f3d6

Please sign in to comment.
Something went wrong with that request. Please try again.