Updated PKGBUILD and .SRCINFO.

2 files changed, 4 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 844d65c32253..9e68357fab39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = git-pair
 	pkgdesc = Pair programming tool to define co-authors in git commits.
-	pkgver = 1.0.1
-	pkgrel = 1
+	pkgver = 1.0.3
+	pkgrel = 2
 	url = https://github.com/avahe-kellenberger/git-pair
 	arch = x86_64
 	license = GPL2
 	makedepends = gcc
 	depends = git
-	source = https://github.com/avahe-kellenberger/git-pair/archive/v1.0.1.tar.gz
-	md5sums = 595758d454dfb75b26d463f0b5f01f16
+	source = https://github.com/avahe-kellenberger/git-pair/archive/v1.0.3.tar.gz
+	md5sums = 10b852babbc8c8140b2ba990bf38a467
 
 pkgname = git-pair
 
diff --git a/PKGBUILD b/PKGBUILD
index ee5e838b9534..2438ae45f237 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,5 @@
 # Maintainer: Avahe Kellenberger <avahe@protonmail.ch>
 pkgname='git-pair'
-<<<<<<< HEAD
 pkgver='1.0.3'
 pkgrel='2'
 pkgdesc="Pair programming tool to define co-authors in git commits."
@@ -20,8 +19,3 @@ build() {
 package() {
     install -Dt "$pkgdir/usr/bin" "$pkgname-$pkgver/$pkgname"
 }
-<<<<<<< HEAD
-=======
-
-md5sums=('595758d454dfb75b26d463f0b5f01f16')
->>>>>>> dafd5f7def73829f8cacc3609978e87249ecae75