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/67/110d77886b2af6309b9212961e72b8583e5fa9            | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9

(limited to 'tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9')

diff --git a/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9 b/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9
new file mode 100644
index 0000000..877bad7
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9
@@ -0,0 +1 @@
+x
��=N1����^r�	!J:.`'��lP^�g�T3�43Ҕ��u
�p��*��Z�	%��l��4ir��H����z,�곥�[�M]a�J��Ґb�5�l�8O�X$Xճ�Ea�")�U�$�d2zO����DŽ��ų��>�m�'�q��Z渍���O`lF��O
�1!n'=�-������]A&e�˯^�o��^�
\ No newline at end of file
-- 
cgit v1.2.3