Fix conflict when merging from master

2015-01-04 12:29:20 +01:00 · 2015-01-04 12:29:20 +01:00 · 39e6de8f68
parent f551b50ec0
commit 39e6de8f68
1 changed files with 0 additions and 4 deletions
--- a/distros/debian8/patches/series
+++ b/distros/debian8/patches/series
@ -1,5 +1 @@
-<<<<<<< HEAD
-01_vendor-perl.diff
 02_service-file-name.diff
-=======
->>>>>>> ac80649e26d0197bf15dc06e505ecc86bd0aae68