Merge branch 'master' into develop

klen · klen · commit 783a6f4782fe · 2016-12-23T15:42:26.000+03:00
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -486,7 +486,7 @@ imported) from project                              *'g:pymode_rope_autoimport'*
 
 Load modules to autoimport by default       *'g:pymode_rope_autoimport_modules'*
 >
-    let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime'])
+    let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime']
 
 Offer to unresolved import object after completion.
 >

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ imported) from project 'g:pymode_rope_autoimport'`
`486`	`486`
`487`	`487`	`Load modules to autoimport by default 'g:pymode_rope_autoimport_modules'`
`488`	`488`	`>`
`489`		`- let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime'])`
	`489`	`+ let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime']`
`490`	`490`
`491`	`491`	`Offer to unresolved import object after completion.`
`492`	`492`	`>`