resolve conflicts

2 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c177cca388f6..e3bc39dfd090 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = pupil-eye-tracking-bin
 	pkgdesc = Open source eye tracking software platform that started as a thesis project at MIT
-	pkgver = 2.0.177
+	pkgver = 2.3.0
 	pkgrel = 1
 	url = https://github.com/pupil-labs/pupil
 	arch = x86_64
 	license = LGPL v3.0
 	options = !strip
-	source = https://github.com/pupil-labs/pupil/releases/download/v2.0/pupil_v2.0-177-g07b3481_linux_x64.zip
-	sha256sums = 678a950ca89fb4589ed34596d677317259e625ef5b778a4afeb39fb803f54ce8
+	source = https://github.com/pupil-labs/pupil/releases/download/v2.3/pupil_v2.3-0-gf7353e6_linux_x64.zip
+	sha256sums = 27f98ded92b7425ce65489b420802d8081dc9ec47a4e82fc7408f34ed171b8b9
 
 pkgname = pupil-eye-tracking-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b5ccf910364..726e0d93ae18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 pkgname=pupil-eye-tracking-bin
 
 _major=2
-_minor=0
-_patch=177
-_commit=07b3481
+_minor=3
+_patch=0
+_commit=f7353e6
 
 pkgver="${_major}.${_minor}.${_patch}"
 pkgrel=1
@@ -19,7 +19,7 @@ _version="${_major_minor}-${_patch}-g${_commit}"
 _source="pupil_${_version}_linux_x64"
 
 source=("https://github.com/pupil-labs/pupil/releases/download/${_major_minor}/${_source}.zip")
-sha256sums=('678a950ca89fb4589ed34596d677317259e625ef5b778a4afeb39fb803f54ce8')
+sha256sums=('27f98ded92b7425ce65489b420802d8081dc9ec47a4e82fc7408f34ed171b8b9')
 options=('!strip')
 
 package() {