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