diff options
Diffstat (limited to 'debian/patches/series')
-rw-r--r-- | debian/patches/series | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index faf4d488..f3e51a29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-remove-README.Debian-from-propellor.cabal.patch 0002-dpkg-mergechangelogs.patch 0003-fix-ccache-haddock.patch +0004-pass-allow-unrelated-histories-to-git-merge.patch |