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>
---
 .../objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538     | Bin 0 -> 375 bytes
 .../objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa     |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa

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

diff --git a/tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538 b/tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538
new file mode 100644
index 0000000..b3919aa
Binary files /dev/null and b/tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538 differ
diff --git a/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa b/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa
new file mode 100644
index 0000000..85887e0
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa
@@ -0,0 +1,2 @@
+x
%P�n�@�|_�H���N��.}%)�Q�e����8�1���9�@R$�&I������������!�w6pF�,K�ң*�HL
s�߯�#���0��+30��0/`#Cib'��]�l
+R�R�q�o�,�k��>�\����vXɸ�P�zII�M6iY],�W�z�p�B��
�z�PdF4�V���.��x�V!�y�
��~9��ր�0u��ho�U`�$��,��_R�:-�a2�%Sw^cJ���>fF���O��v���;�+��
\ No newline at end of file
-- 
cgit v1.2.3