update

2 files changed, 14 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b5ad1ae4c0d..67a2caec928f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jun 10 20:10:09 UTC 2016
+# Wed Mar  1 17:52:42 UTC 2017
 pkgbase = fancontrol-common
 	pkgdesc = Common resources used by fancontrol-gui and fancontrol-kcm
-	pkgver = v0.4.1
-	pkgrel = 2
+	pkgver = v0.5
+	pkgrel = 1
 	url = https://github.com/Maldela/Fancontrol-GUI
 	arch = i686
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = fancontrol-common
 	depends = lm_sensors
 	depends = kauth
 	depends = kpackage
-	source = fancontrol-gui::git+https://github.com/Maldela/fancontrol-gui.git#branch=0.4
+	source = fancontrol-gui::git+https://github.com/Maldela/fancontrol-gui.git#branch=0.5
 	md5sums = SKIP
 
 pkgname = fancontrol-common
diff --git a/PKGBUILD b/PKGBUILD
index 422224ec0c1f..6bb282ea040e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,13 @@
 # Maintainer: Malte Veerman <maldela@halloarsch.de>
 
 pkgname=fancontrol-common
+<<<<<<< HEAD
 _srcname=fancontrol-gui-0.6
 pkgver=v0.6
+=======
+_srcname=fancontrol-gui
+pkgver=v0.5
+>>>>>>> d071268bf87804cc79daa4eb7928c49768ed2752
 pkgrel=1
 pkgdesc="Common resources used by fancontrol-gui and fancontrol-kcm"
 arch=('i686' 'x86_64')
@@ -11,8 +16,13 @@ url="https://github.com/Maldela/Fancontrol-GUI"
 license=('GPL2')
 depends=('qt5-declarative' 'qt5-quickcontrols' 'kirigami2' 'hicolor-icon-theme' 'lm_sensors' 'kauth' 'kpackage')
 makedepends=('git' 'extra-cmake-modules')
+<<<<<<< HEAD
 source=('https://github.com/Maldela/fancontrol-gui/archive/v0.6.tar.gz')
 md5sums=('5088db3b423c098b56d2b0bc73f27aa1')
+=======
+source=('fancontrol-gui::git+https://github.com/Maldela/fancontrol-gui.git#branch=0.5')
+md5sums=('SKIP')
+>>>>>>> d071268bf87804cc79daa4eb7928c49768ed2752