summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO6
1 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6f710a3ba372..09780a5fcceb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Jun 30 12:42:14 UTC 2016
+# Thu Jun 30 12:48:23 UTC 2016
pkgbase = gvim-git
pkgdesc = Vim the editor. CLI version and GTK2 GUI providing majority of features.
pkgver = 7.4.1967
- pkgrel = 1
+ pkgrel = 2
url = http://www.vim.org
arch = i686
arch = x86_64
@@ -25,8 +25,8 @@ pkgbase = gvim-git
provides = xxd
conflicts = vim-minimal
conflicts = vim-minimal-git
+ conflicts = vim
conflicts = vim-git
- conflicts = vim-git-git
conflicts = vim-python3
conflicts = gvim
conflicts = gvim-python3