diff options
-rw-r--r-- | PKGBUILD | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -2,13 +2,8 @@ # 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') @@ -16,13 +11,8 @@ 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 |