Removing yet other merge garbage…

perfsonar · Apr 20, 2023 · f0066ed · f0066ed
1 parent 459f603
commit f0066ed
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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 <[email protected]>  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