summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-config/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/LinHES-config/PKGBUILD')
-rw-r--r--abs/core/LinHES-config/PKGBUILD9
1 files changed, 7 insertions, 2 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index a4cec3b..b94878b 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=22
+pkgrel=30
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -110,7 +110,7 @@ md5sums=('6259677916192a92d1adf47b276f7829'
'c20f73d4da5d7e15e1f3eb85c7dcb49a'
'8ac1cfd2eca0f641737da0d0aca416a7'
'9ae8d79f620c6d19973c55c32a921874'
- 'ad2ba000decfc1e50533692f1793e620'
+ '287c91018794963a52510273f08d3de7'
'ecf9e5df20683a769c4a8a8f2d65de85'
'e459ed069317bccb20351f037a9df3d2'
'97de45a04f4efbd9d40d9fc0e1db1c3f'
@@ -121,8 +121,13 @@ md5sums=('6259677916192a92d1adf47b276f7829'
'a225143e3df6f56d451c2875e54ddbae'
'9151c74fcaf18ec4cf5e757cfdbc7017'
'3d1e4a119f38cff0498bf8a67e94e4b3'
+<<<<<<< HEAD
'fb80a58b1b4cfb26aee48bc991162b40'
'5f3259afe031fda189edae41dd1458f0'
+=======
+ 'd6c2d07c58ca6484c5be8b7093b921cd'
+ 'e6538618f7bb5fb6b79c132803451c39'
+>>>>>>> origin/testing
'41b03fb1e0a9d9ae7588e3b813212772'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'56ca5fd7d6b8d1828c95d13eb0d34de5'