summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee')
-rw-r--r--tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370feebin94 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee b/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee
deleted file mode 100644
index 144225df1..000000000
--- a/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee
+++ /dev/null
Binary files differ