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/fd/57d2d6770fad8e9959124793a17f441b571e66     | Bin 0 -> 279 bytes
 .../objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a     |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a

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

diff --git a/tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 b/tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66
new file mode 100644
index 0000000..21e6b2c
Binary files /dev/null and b/tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 differ
diff --git a/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a b/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a
new file mode 100644
index 0000000..2f9d83b
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a
@@ -0,0 +1,2 @@
+x
��K!D]s
+.��{`�c�x/��ɸ`0���o��URy�����|�Y`�dP�A!�����4C2d=x#����e`Bgr��u��bL����f�fG�@�՗��-�}K�Բ�U�y�=]�;��)�r�0 R�$��(%�����o=׶���OPw
\ No newline at end of file
-- 
cgit v1.2.3