From 29b5ab554790bb57337a3b6ab9dcd963cf69d22e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 14:47:08 +0200
Subject: Adding upstream version 1.7.2+ds.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced           | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced

(limited to 'tests/resources/merge-resolve/.gitted/objects/38')

diff --git a/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced b/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced
new file mode 100644
index 0000000..e95ff3a
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced
@@ -0,0 +1,2 @@
+x
-MK
+1u�S�Y�Rą��6C��6�뛪��okn���Yt �Ep�	i�D��Cd����dL�B+8�%�q���k���+�e��6�fH�B���1J���4�F�1l
\ No newline at end of file
-- 
cgit v1.2.3