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/d8/e05a90b3c2240d71a20c2502c937d9b7d22777           | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777

(limited to 'tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777')

diff --git a/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 b/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777
new file mode 100644
index 0000000..b157ba1
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777
@@ -0,0 +1,2 @@
+x
%P�n�@�|_��IQ�S�)SХ�$2ʶp>'9F��:gH���$i����t���]p�:oB8���u0L2�N!=Z���Ĕ�0���B: ���!ѽ1�.s	��Ӽ60�Fv�Z���MA�^
+Vn�-�y�b�6<0ׇ�����q���-jT/)ɲʦ"-����[��UO�g���z@��>����+�r�^�[<a��ż���~9��ր�0u��h�E`�$��$���S�:��a2�%Sw^bJ���>fF���O��v���ۄ𶋅
\ No newline at end of file
-- 
cgit v1.2.3