Fix lint

Author: lunny

integrations/migrate_test.go

@@ -9,12 +9,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models"
-<<<<<<< HEAD
-	"code.gitea.io/gitea/modules/migrations"
-=======
-	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/unittest"
->>>>>>> 376f01539 (Fix imports)
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/services/migrations"