summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Łukasik <mati75@linuxmint.pl>2018-06-07 12:53:26 +0200
committerMateusz Łukasik <mati75@linuxmint.pl>2018-06-07 12:53:26 +0200
commit6dc59d2042f358b943665a82777471acbcebb396 (patch)
tree7bcd140974c97f5b0b8926c9fb7c79e5934ef6b8
parent1bc5b136773ecc0009cbad1295579c570dc94a53 (diff)
Clean patches
-rw-r--r--debian/patches/series4
1 files changed, 0 insertions, 4 deletions
diff --git a/debian/patches/series b/debian/patches/series
index e472bb7..e04dcbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,8 +3,4 @@
05-add-debian-hardening-flags.patch
06-tryfixplaylist.patch
01-update-mime-types.patch
-<<<<<<< HEAD
03-update-mongoose-to-6.11.patch
-=======
-07-disable-chromecast.patch
->>>>>>> d7d51f7d4d46825f7d490abd616dec63c5ec4a8a