VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-09 15:24:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed some merge conflicts again

Browse Source
This commit is contained in:
David Halter
2012-04-05 19:48:27 +02:00
parent 412442821a
commit 1724a64e8d
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test.py
View File

@@ -130,11 +130,7 @@ import time
class c1():
c2,c5 = c1(), c1().c3()
def c3(self):
<<<<<<< HEAD
import os as c4 #from parsing import Scope as c4
=======
import tokenize as c4 #from parsing import Scope as c4
>>>>>>> 118908f3118ef557502dd35ca10a98ca547f3ce1
c5 = c4
c5 = 1
return c5+1+'asdf'
@@ -149,7 +145,4 @@ asdf = c1; asdf2 = asdf
b= asdf2
#import parsing as test
c = b().c3()
<<<<<<< HEAD
c = "a".join([1,2])
=======
>>>>>>> 118908f3118ef557502dd35ca10a98ca547f3ce1