[neon/extras/labplot/Neon/release] debian/patches: patches conflict

Jonathan Riddell null at kde.org
Mon Nov 9 13:33:50 GMT 2020


Git commit 97b299a9de7f193a14d18fa1a0c24f17835d1213 by Jonathan Riddell.
Committed on 09/11/2020 at 13:33.
Pushed by jriddell into branch 'Neon/release'.

patches conflict

M  +1    -1    debian/patches/series

https://invent.kde.org/neon/extras/labplot/commit/97b299a9de7f193a14d18fa1a0c24f17835d1213

diff --git a/debian/patches/series b/debian/patches/series
index 735d3b5..c939555 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-cantor-20.08.1-still-uses-old-code-minor-formating-f.patch
+#0001-cantor-20.08.1-still-uses-old-code-minor-formating-f.patch
 cantor-20.08.diff


More information about the Neon-commits mailing list