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

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

diff --git a/tests/resources/merge-recursive/.gitted/objects/26/d3c94459b4faa08f009b15867993ca34153592 b/tests/resources/merge-recursive/.gitted/objects/26/d3c94459b4faa08f009b15867993ca34153592
new file mode 100644
index 0000000..dd7b1a2
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/26/d3c94459b4faa08f009b15867993ca34153592
@@ -0,0 +1,2 @@
+x
��A
+1E]�����vڂ�+O �3mF���*x{�\��y��Z�܀�7��B�H5����Ț:sY��B�9D��3O��h��k1��T-�ؑ���pt��>N"1[!#�v_+\>uV���o,�ӭȼ��Z�@���2l1 �N{`�?Ts6_?B*
\ No newline at end of file
-- 
cgit v1.2.3