summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765')
-rw-r--r--tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df7651
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765 b/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765
deleted file mode 100644
index 95327ed64..000000000
--- a/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765
+++ /dev/null
@@ -1 +0,0 @@
-xAjC1 D)ّe}%z^ߖ,wpr: tVԶ6RBBLh,9+%rǮh1%p"=Iue{ڶ߶Igrm-23/'|R~Uk{dJ \ No newline at end of file