remove boost branch merging

2 files changed, 2 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d83931f47fe..846d1efbe643 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = osvr-core-git
 	pkgdesc = The core libraries, applications, and plugins of the OSVR software platform.
-	pkgver = 0.2.r2225.ga6aa62d
+	pkgver = 0.2.r2243.g9456a41
 	pkgrel = 1
 	url = https://github.com/OSVR/OSVR-Core
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 348ef8598bbf..7c375609dfec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=osvr-core-git
-pkgver=0.2.r2225.ga6aa62d
+pkgver=0.2.r2243.g9456a41
 pkgrel=1
 pkgdesc="The core libraries, applications, and plugins of the OSVR software platform."
 arch=(i686 x86_64)
@@ -37,7 +37,6 @@ prepare() {
 #temporary fix for boost incompatibility
 #sed -i "s/105900/106200/g" src/osvr/Common/IPCRingBuffer.cpp #doesn't work with 1.62
 #sed -i "s/105900/106200/g" cmake-local/BoostTargets.cmake
-  git merge origin/boost-1.62.0 --no-edit
 
 #https://github.com/OSVR/OSVR-Core/pull/468
 cd vendor/vrpn