revert to release 29

2 files changed, 31 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e69de29bb2d1..9e10ed023b49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -0,0 +1,31 @@
+pkgbase = pokerth
+	pkgdesc = Client to online Poker game written in C++/Qt
+	pkgver = 1.1.2
+	pkgrel = 35
+	url = http://www.pokerth.net/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	license = custom
+	makedepends = boost
+	depends = curl
+	depends = boost-libs
+	depends = gsasl
+	depends = protobuf
+	depends = qt5-base
+	depends = sdl_mixer
+	depends = tinyxml
+	source = https://sourceforge.net/projects/pokerth/files/pokerth/1.1.2/pokerth-1.1.2.tar.gz
+	source = pokerth-1.1.2.patch
+	source = pokerth-1.1.2.patch.2019
+	source = pokerth-1.1.2.patch.2020
+	source = pokerth-1.1.2.patch.2023
+	source = pokerth-1.1.2.patch.xdg.2023
+	md5sums = 8fd7d7fc7ece17315e58aa3240dd4586
+	md5sums = 0ef5541fc6008dfb2521dcab47afb659
+	md5sums = 50d427bd8afc57fb61e186de6c4e5601
+	md5sums = 2204bc9d820057d5d4b04d675cf09198
+	md5sums = 5efeb1305e3d6ff4b60edf1fd7f939b6
+	md5sums = e61eae14e6394f4745245e2ef42d812c
+
+pkgname = pokerth
diff --git a/PKGBUILD b/PKGBUILD
index 1cf978520b4a..8dac47ccba35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,6 @@
 
 pkgname=pokerth
 pkgver=1.1.2
-<<<<<<< HEAD
 pkgrel=35
 
 pkgdesc="Client to online Poker game written in C++/Qt"