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

(limited to 'tests/resources/merge-recursive/.gitted/objects/72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4')

diff --git a/tests/resources/merge-recursive/.gitted/objects/72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 b/tests/resources/merge-recursive/.gitted/objects/72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4
new file mode 100644
index 0000000..01d113e
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4
@@ -0,0 +1,2 @@
+x
��[
+1E��*�
���Ağفȴ)#8S�U�ow�Dž�����.˥�E���8�B�t�6'�<�`��bvh=�I_ԍ����D����)�Bq}D��	)z��6�Z��\�{]��B?Չ��_�Ku9�At��l5j������Qc��O��znO6
\ No newline at end of file
-- 
cgit v1.2.3