Click here to go back to the commit logs for neovim-git.

Commit:

---

Hash: 0cb14c6f019f89d91914de997a5fe4fef2ba309f

Message: removed vim as conflicts

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 787a7d1..f1ae408 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -46,7 +46,6 @@ pkgbase = neovim-git
 	optdepends = wl-clipboard: for clipboard support on wayland (see :help clipboard)
 	provides = neovim
 	conflicts = neovim
-	conflicts = vim
 	options = !strip
 	source = git://github.com/neovim/neovim.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3c46619..1d2c1f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ license=('custom:neovim')
 source=("git://github.com/neovim/neovim.git")
 sha256sums=("SKIP")
 provides=('neovim')
-conflicts=('neovim' 'vim')
+conflicts=('neovim')
 # replaces=('neovim' 'vim')
 options=(!strip)
 #post_install=