From: Daniel Hahler <git@thequod.de>
Date: Sun, 18 Nov 2018 11:00:33 +0000 (+0100)
Subject: Merge branch 'master' into searchpair-timeout
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/c2e53f8cab69594b3fffbbdcbbe38acafdb7ca19?hp=88333bde264a6cb4d81f68a962bfc0d883e7ed39

Merge branch 'master' into searchpair-timeout

Conflicts:
	indent/python.vim
---

diff --git a/indent/python.vim b/indent/python.vim
index b053083..5da97e9 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -95,7 +95,6 @@ else
     endfunction
 endif
 
-
 " Use 'shiftwidth()' instead of '&sw'.
 " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop').
 if exists('*shiftwidth')