From b88736462df2c86a83f01dcc260b5463205819d2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 21 May 2024 07:03:04 +0200
Subject: Adding upstream version 1.8.1+ds.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../.gitted/objects/ea/789495e0a72efadcd0f86a48f4c9ed435bb8a3          | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/ea/789495e0a72efadcd0f86a48f4c9ed435bb8a3

(limited to 'tests/resources/merge-resolve/.gitted/objects/ea/789495e0a72efadcd0f86a48f4c9ed435bb8a3')

diff --git a/tests/resources/merge-resolve/.gitted/objects/ea/789495e0a72efadcd0f86a48f4c9ed435bb8a3 b/tests/resources/merge-resolve/.gitted/objects/ea/789495e0a72efadcd0f86a48f4c9ed435bb8a3
new file mode 100644
index 0000000..ed98d70
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/ea/789495e0a72efadcd0f86a48f4c9ed435bb8a3
@@ -0,0 +1,3 @@
+x
�OIj1�Y��!��������V��A� ����M~�:�E��~&o>���Z;�uB[��J�rN9z)�V�b���!�.Rj
+:�
+�$�ŘK�:��!c	���\˃F�ｷ[?�K��by�{;���� �pA-w������S[_i��{WOG�R�
\ No newline at end of file
-- 
cgit v1.2.3