diff --git a/modules/swagger-codegen/src/main/resources/go-server/main.mustache b/modules/swagger-codegen/src/main/resources/go-server/main.mustache
index 26ff3ea6abd..d60abbb9294 100644
--- a/modules/swagger-codegen/src/main/resources/go-server/main.mustache
+++ b/modules/swagger-codegen/src/main/resources/go-server/main.mustache
@@ -2,14 +2,14 @@ package main
 
 import (
 	sw "./{{apiPath}}"
-    "log"
-    "net/http"
+	"log"
+	"net/http"
 )
 
 func main() {
 	log.Printf("Server started")
 
-    router := sw.NewRouter()
-    
-    log.Fatal(http.ListenAndServe(":{{serverPort}}", router))
+	router := sw.NewRouter()
+	
+	log.Fatal(http.ListenAndServe(":{{serverPort}}", router))
 }
diff --git a/samples/server/petstore/go-api-server/go-api-server b/samples/server/petstore/go-api-server/go-api-server
deleted file mode 100755
index fac53f177d5..00000000000
Binary files a/samples/server/petstore/go-api-server/go-api-server and /dev/null differ
diff --git a/samples/server/petstore/go-api-server/main.go b/samples/server/petstore/go-api-server/main.go
index 7cfecef4a78..d28020031c3 100644
--- a/samples/server/petstore/go-api-server/main.go
+++ b/samples/server/petstore/go-api-server/main.go
@@ -2,14 +2,14 @@ package main
 
 import (
 	sw "./go"
-    "log"
-    "net/http"
+	"log"
+	"net/http"
 )
 
 func main() {
 	log.Printf("Server started")
 
-    router := sw.NewRouter()
-    
-    log.Fatal(http.ListenAndServe(":8080", router))
+	router := sw.NewRouter()
+	
+	log.Fatal(http.ListenAndServe(":8080", router))
 }