From 08f1dd5477dfe1e6808d9b60985321051ed0e0e7 Mon Sep 17 00:00:00 2001
From: Armani Ferrante <armaniferrante@Armanis-MacBook-Pro.local>
Date: Thu, 16 Nov 2017 14:58:20 -0800
Subject: [PATCH] rpc: fix formatting errors from merge conflicts

---
 rpc/http.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpc/http.go b/rpc/http.go
index dd51caf6ac..68634e3fdf 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -147,10 +147,10 @@ func NewHTTPServer(cors []string, srv *Server) *http.Server {
 
 // ServeHTTP serves JSON-RPC requests over HTTP.
 func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-  // Permit dumb empty requests for remote health-checks (AWS)
+	// Permit dumb empty requests for remote health-checks (AWS)
 	if r.Method == "GET" && r.ContentLength == 0 && r.URL.RawQuery == "" {
 		return
-  }
+	}
 	if responseCode, errorMessage := httpErrorResponse(r); responseCode != 0 {
 		http.Error(w, errorMessage, responseCode)
 		return