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/cc/338e4710c9b257106b8d16d82f86458d5beaf1           | 2 ++
 .../.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f           | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1
 create mode 100644 tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f

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

diff --git a/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1 b/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1
new file mode 100644
index 0000000..85b3b81
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1
@@ -0,0 +1,2 @@
+x
��K!]s�����3`b�o�����1��gpW�E�G��m��x]�������6d
+���ea�Ή碵z�.�
��Dv	�[�h����D�[�Jﱶw����X[��.2�nu���VƉZ�ڳF�!x8�8���G���P��P_�?KN
\ No newline at end of file
diff --git a/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f b/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
new file mode 100644
index 0000000..9a0cb7a
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
@@ -0,0 +1,2 @@
+x
��]
+�0�}�)����&
_��H�
-�Fb��[��6�}0L��2wP��zc����*�sXb��
Rt��#G�$�[l�vH��$��k��f.ʧL�F+�Q�H�D|��68�Wl.S]�u�o��N���Ou9��Va0^Z��F��������9^#�
�Od
\ No newline at end of file
-- 
cgit v1.2.3