summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff')
-rw-r--r--tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff b/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff
deleted file mode 100644
index ffcf843c2..000000000
--- a/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff
+++ /dev/null
@@ -1,3 +0,0 @@
-xK!D]s
-.i~=Lbo@dfE UTj)kښ]om5(3j&4߻ppiRI;9Qg_j
--RVȃ~ҙTI*tr g;9#Rmkb%rLN \ No newline at end of file