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/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460            | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460

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

diff --git a/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 b/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460
new file mode 100644
index 0000000..b02cda4
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460
@@ -0,0 +1 @@
+x
��K� @]s����)Ё�7���]�I(�x{��^��,�nлSo�`�/�X�)ٙB@G�Ô��a�D� ���4x�wl���Cv��?��-79d�,�h�F4����Z
;Ɲ�H����}���=�
\ No newline at end of file
-- 
cgit v1.2.3