Merge branch 'master' into ast

Conflicts:
	complete.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/builtin.cpp b/builtin.cpp
index a783828e..59f3cf71 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -1618,24 +1618,24 @@ static int builtin_echo(parser_t &parser, wchar_t **argv)
                 {
                     case L'n':
                         print_newline = false;
-                    break;
+                        break;
                     case L'e':
                         interpret_special_chars = true;
-                    break;
+                        break;
                     case L's':
                         // fish-specific extension,
                         // which we should try to nix
                         print_spaces = false;
-                    break;
+                        break;
                     case L'E':
                         interpret_special_chars = false;
-                    break;
+                        break;
                 }
             }
         }
         else
         {
-            invalid_echo_option:
+invalid_echo_option:
             break;
         }
         argv++;