summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO4
1 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 265f55153470..cef226dada0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Jan 30 19:39:08 UTC 2016
pkgbase = resolve-trivial-conflicts-git
pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories.
- pkgver = r52.48ae21a
+ pkgver = r70.84d10f2
pkgrel = 1
url = https://github.com/ElastiLotem/resolve-trivial-conflicts
arch = i686