From 187cf643521e0bf32e584f8d7d1fa0ea6590f75a0e77c485d8044b858d844f56 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 9 Sep 2025 09:39:38 +0000 Subject: [PATCH] remove conflict marker from perl-App-CELL.changes Signed-off-by: Olaf Hering --- perl-App-CELL.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/perl-App-CELL.changes b/perl-App-CELL.changes index 940e304..6de0446 100644 --- a/perl-App-CELL.changes +++ b/perl-App-CELL.changes @@ -292,7 +292,6 @@ Wed Jun 4 17:54:08 UTC 2014 - ncutler@suse.com - updated to 0.158 ------------------------------------------------------------------- ->>>>>>> ./perl-App-CELL.changes.r4 Sun May 25 10:44:10 UTC 2014 - ncutler@suse.com - updated to 0.119 -- 2.49.0