diff options
| author | Tamal Saha <tamal@appscode.com> | 2019-08-23 09:40:30 -0700 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-08-23 12:40:29 -0400 |
| commit | 171b3598778a1ecd0a921c71ed6755bfef68f7f0 (patch) | |
| tree | 02857629ef9e8e26ee0ee559153f803f77b588b7 /integrations/pull_merge_test.go | |
| parent | ca6fb004ac50fc924861112403895d637c6a2d1d (diff) | |
| download | gitea-171b3598778a1ecd0a921c71ed6755bfef68f7f0.tar.gz gitea-171b3598778a1ecd0a921c71ed6755bfef68f7f0.zip | |
Use gitea forked macaron (#7933)
Signed-off-by: Tamal Saha <tamal@appscode.com>
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 2 |
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 { |