Merge branch 'master' into ast

Conflicts:
	complete.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/expand.cpp b/expand.cpp
index 45d29249..5b4a0a7f 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -1752,15 +1752,15 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
 
         remove_internal_separator(next_str, (EXPAND_SKIP_WILDCARDS & flags) ? true : false);
         const wchar_t *next = next_str.c_str();
-        
+
         const bool has_wildcard = wildcard_has(next, 1);
-        
+
         if (has_wildcard && (flags & EXECUTABLES_ONLY))
         {
             // Don't do wildcard expansion for executables. See #785. So do nothing here.
         }
         else if (((flags & ACCEPT_INCOMPLETE) && (!(flags & EXPAND_SKIP_WILDCARDS))) ||
-                has_wildcard)
+                 has_wildcard)
         {
             const wchar_t *start, *rest;