Skip to content

Commit 45b3e72

Browse files
committed
fix(lint): should be written without leading space
1 parent ad4c6b0 commit 45b3e72

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

serve_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ import (
1414
"github.com/stretchr/testify/assert"
1515
)
1616

17-
<<<<<<< HEAD:serve_test.go
17+
//nolint:unparam
1818
func PerformRequest(r http.Handler, method, path string) *httptest.ResponseRecorder {
19-
req, _ := http.NewRequest(method, path, nil)
20-
=======
21-
// nolint:unparam
22-
func performRequest(r http.Handler, method, path string) *httptest.ResponseRecorder {
2319
req, _ := http.NewRequestWithContext(context.Background(), method, path, nil)
24-
>>>>>>> 7756450 (chore(lint): add golang lint config):static_test.go
2520
w := httptest.NewRecorder()
2621
r.ServeHTTP(w, req)
2722
return w

0 commit comments

Comments
 (0)