fix: code conflict

xiang-xx · Jan 4, 2023 · 4c4858e · 4c4858e
1 parent 539e007
commit 4c4858e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rest/handler/tracinghandler.go b/rest/handler/tracinghandler.go
@@ -104,11 +104,7 @@ func TracingHandler(serviceName, path string) func(http.Handler) http.Handler {
 			if trw.code >= http.StatusBadRequest {
 				span.SetStatus(codes.Error, http.StatusText(trw.code))
 			} else {
-<<<<<<< HEAD
 				span.SetStatus(codes.Ok, http.StatusText(trw.code))
-=======
-				span.SetStatus(codes.Ok, "")
->>>>>>> da8f51ec4eb5ec2bb78c282bcf5727833755ddc8
 			}
 		})
 	}