summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec S2018-04-25 15:49:42 -0700
committerAlec S2018-04-25 15:49:42 -0700
commit5f877412e33e0251e3e7c16f4abf7d8f0e014e06 (patch)
treef285f81f416939d254594e77d948a4de48a058be
parentfdedf66f78f33de331ab0d9c9a96ad6ddc23905e (diff)
parent02b68b4934ee895c21c21f13d5127ee0e1af32ff (diff)
downloadaur-5f877412e33e0251e3e7c16f4abf7d8f0e014e06.tar.gz
fix merge conflicts
Diffstat
-rw-r--r--.SRCINFO2
1 files changed, 1 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5c05dc4eeb75..762034295759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Apr 25 22:47:08 UTC 2018
+# Wed Apr 25 22:48:40 UTC 2018
pkgbase = git-town
pkgdesc = A git extension for generic high-level git workflow support
pkgver = 7.1.1