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

(limited to 'tests/resources/merge-resolve/.gitted/objects/33/d500f588fbbe65901d82b4e6b008e549064be0')

diff --git a/tests/resources/merge-resolve/.gitted/objects/33/d500f588fbbe65901d82b4e6b008e549064be0 b/tests/resources/merge-resolve/.gitted/objects/33/d500f588fbbe65901d82b4e6b008e549064be0
new file mode 100644
index 0000000..061a031
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/33/d500f588fbbe65901d82b4e6b008e549064be0
@@ -0,0 +1,2 @@
+x
��A� E]s
+.�hb�o���.Z�x}[�
���~����k������CA��<:km`d��̑d,!:𦐳�����������
�P1�P� qHcc�HE�O��[zsK�>�y��>��隿ï���m�����6�����*��R�n�>��O�
\ No newline at end of file
-- 
cgit v1.2.3