Merge branch 'main' into develop

aws-quickstart · Oct 15, 2020 · 61697e8 · 61697e8
2 parents 3550a97 + 6c8a158
commit 61697e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,7 +4,7 @@
 [submodule "submodules/quickstart-amazon-eks"]
 	path = submodules/quickstart-amazon-eks
 	url = git@github.com:aws-quickstart/quickstart-amazon-eks.git
-    branch = main
+	branch = main
 [submodule "docs/boilerplate"]
 	path = docs/boilerplate
 	url = https://github.com/aws-quickstart/quickstart-documentation-base-common.git
diff --git a/templates/kubesphere-entrypoint-new-vpc.template.yaml b/templates/kubesphere-entrypoint-new-vpc.template.yaml
@@ -445,7 +445,3 @@ Outputs:
     Value: !GetAtt KubeSphereStack.Outputs.KubeSphereConsole
   KubeSphereConsoleLoginUser:
     Value: admin
-
-
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -445,7 +445,3 @@ Outputs:
		Value: !GetAtt KubeSphereStack.Outputs.KubeSphereConsole
		KubeSphereConsoleLoginUser:
		Value: admin