summaryrefslogtreecommitdiffstats
path: root/integrations/pull_merge_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'integrations/pull_merge_test.go')
-rw-r--r--integrations/pull_merge_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index 2f4e48f293..27f9fc6bb9 100644
--- a/integrations/pull_merge_test.go
+++ b/integrations/pull_merge_test.go
@@ -15,8 +15,8 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/test"
- "github.com/Unknwon/i18n"
"github.com/stretchr/testify/assert"
+ "github.com/unknwon/i18n"
)
func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string, mergeStyle models.MergeStyle) *httptest.ResponseRecorder {