resolve conflict with main branch

go-gitea · Feb 27, 2024 · 3f3cc09 · 3f3cc09
1 parent 052737a
commit 3f3cc09
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/tests/integration/api_repo_file_create_or_update_test.go b/tests/integration/api_repo_file_create_or_update_test.go
@@ -17,10 +17,10 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/services/context"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go