diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:50:52 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-07 11:16:03 +1000 |
| commit | 7410acd1aaa97f678295a328264360802346b33a (patch) | |
| tree | 51dc6b5dfc8c0b67711ff644a6bc32480e6eaea8 /pkg/integration/integration.go | |
| parent | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (diff) | |
move merge conflicts code into controller
Diffstat (limited to 'pkg/integration/integration.go')
| -rw-r--r-- | pkg/integration/integration.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index c56134a4a..ab176d121 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -202,7 +202,7 @@ func RunTests( // validates that the actual and expected dirs have the same repo names (doesn't actually check the contents of the repos) func validateSameRepos(expectedDir string, actualDir string) error { - // iterate through each repo in the expected dir and comparet to the corresponding repo in the actual dir + // iterate through each repo in the expected dir and compare to the corresponding repo in the actual dir expectedFiles, err := ioutil.ReadDir(expectedDir) if err != nil { return err |