Skip to content

Commit a658223

Browse files
committed
fix bad merge
1 parent 48081f2 commit a658223

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tests/test_utils.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"database/sql"
1010
"fmt"
1111
"os"
12+
"path"
1213
"path/filepath"
1314
"testing"
1415

@@ -195,7 +196,7 @@ func PrepareGitRepoDirectory(t testing.TB) {
195196
if !assert.NotEmpty(t, setting.RepoRootPath) {
196197
return
197198
}
198-
assert.NoError(t, unittest.SyncDirs(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
199+
assert.NoError(t, unittest.SyncDirs(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
199200

200201
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
201202
if err != nil {

0 commit comments

Comments
 (0)