ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict when merging from master

This commit is contained in:
Emmanuel Papin 2015-01-04 12:29:20 +01:00
parent f551b50ec0
commit 39e6de8f68
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distros/debian8/patches/series
View File

@ -1,5 +1 @@
<<<<<<< HEAD
01_vendor-perl.diff
02_service-file-name.diff 02_service-file-name.diff
=======
>>>>>>> ac80649e26d0197bf15dc06e505ecc86bd0aae68