diff options
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.stdout')
| -rw-r--r-- | tests.merging/conflict-stratum-field-ordering.stdout | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.stdout b/tests.merging/conflict-stratum-field-ordering.stdout deleted file mode 100644 index f55822a9..00000000 --- a/tests.merging/conflict-stratum-field-ordering.stdout +++ /dev/null @@ -1,2 +0,0 @@ -Merge conflicts in test:morphs: - hello-stratum.morph |