diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-23 14:40:28 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | a2318d75b5a81aba6f79ffbd76c8a602121ac20c (patch) | |
| tree | 4288c9265a2ed3d70761f3295783a53d718c5230 /test | |
| parent | 1dd7307fde033dae5fececac15810a99e26c3d91 (diff) | |
fix some things
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/mergeConflictsFiltered/test.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/mergeConflictsFiltered/test.json b/test/integration/mergeConflictsFiltered/test.json index 7d6d3b9ca..fc1c9236a 100644 --- a/test/integration/mergeConflictsFiltered/test.json +++ b/test/integration/mergeConflictsFiltered/test.json @@ -1,4 +1,4 @@ { "description": "Verify that when we get merge conflicts we filter out any non-conflicted files", - "speed": 20 + "speed": 1 } |