summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a')
-rw-r--r--tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a b/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a
deleted file mode 100644
index 143093831..000000000
--- a/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a
+++ /dev/null
@@ -1,2 +0,0 @@
-xK!D]s
-.z7 |2. bhWKVmH0~7z"P9`:Qi)QLEyq=oC*P6-"4l0StAH<u$sKzum6y̓~9_;VOR4zXWtO6V4NF \ No newline at end of file