From f0066ed98ccf015c0ecb31e0e642bc1c1a16c047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Thu, 20 Apr 2023 11:21:06 +0200 Subject: [PATCH] =?UTF-8?q?Removing=20yet=20other=20merge=20garbage?= =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python-pscheduler/pscheduler/unibuild-packaging/deb/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/python-pscheduler/pscheduler/unibuild-packaging/deb/changelog b/python-pscheduler/pscheduler/unibuild-packaging/deb/changelog index 2e33cf564..a9cc396c1 100644 --- a/python-pscheduler/pscheduler/unibuild-packaging/deb/changelog +++ b/python-pscheduler/pscheduler/unibuild-packaging/deb/changelog @@ -21,7 +21,6 @@ python-pscheduler (4.4.5-2) perfsonar-4.4; urgency=low * New upstream version. -- perfSONAR developers Mon, 26 Sep 2022 18:23:19 +0000 ->>>>>>> master:python-pscheduler/pscheduler/debian/changelog python-pscheduler (4.4.4-1) perfsonar-4.4; urgency=low