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/c4/e6cca3ec6ae0148ed231f97257df8c311e015f            | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f

(limited to 'tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f')

diff --git a/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f b/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f
new file mode 100644
index 0000000..2bbf28f
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f
@@ -0,0 +1 @@
+x
%P1n�0��W�
�C�NE�N7��:*��p�Ԓ/��W�mI���$=^^��._�?��~|�C����6�yTȄA�(#1e���鴓.����(�Hto@̸K-a��������s�1r6)&)8�ŷT��a��<0ׇ�J٢�[���K�5IJ������c���q͓쌫r_�ۇ"u^@��7~X)���2����	G�,�f�R���`B���4�3���v�Q����H֩��u��a�b Sw�cJ�q�)fƔ��O��v���;�����
\ No newline at end of file
-- 
cgit v1.2.3