diff options
Diffstat (limited to 'tests.merging/conflict-morphology-kind.stderr')
| -rw-r--r-- | tests.merging/conflict-morphology-kind.stderr | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests.merging/conflict-morphology-kind.stderr b/tests.merging/conflict-morphology-kind.stderr deleted file mode 100644 index ff6539a7..00000000 --- a/tests.merging/conflict-morphology-kind.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: merge conflict: "kind" of morphology hello-system.hello-stratum changed from stratum to chunk |