From a5c57df73874190ce919afdf028066754bc2a713 Mon Sep 17 00:00:00 2001
From: "David Adam (zanchey)" <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 26 Mar 2015 17:52:13 +0800
Subject: [PATCH] debian: remove conflicts

---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7d90f12..68f7aad 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Vcs-Browser: https://github.com/fish-shell/fish-shell
 
 Package: fish
 Architecture: any
-Conflicts: fish
 Depends: ${shlibs:Depends}, ${misc:Depends}, passwd (>= 4.0.3-10), bc, gettext-base, man-db
 Recommends: python (>=2.6), xsel (>=1.2.0)
 Description: friendly interactive shell
-- 
GitLab