diff options
author | Aaditya Bagga | 2016-03-13 20:25:31 +0530 |
---|---|---|
committer | Aaditya Bagga | 2016-03-13 20:25:31 +0530 |
commit | 979c775d7e3c092fd7584c9d4de6b3583f0dfd55 (patch) | |
tree | fa3384b1441c706d12bdd185925637a3c1c4e557 /.SRCINFO | |
parent | 8b64e265e599986e9104c2c72407af73404b28d4 (diff) | |
parent | dcec1596dc9aae6d8c6423c48ec4a0dbdb73eb40 (diff) | |
download | aur-979c775d7e3c092fd7584c9d4de6b3583f0dfd55.tar.gz |
resolved merge conflict
Diffstat (limited to '.SRCINFO')
-rw-r--r-- | .SRCINFO | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sun Feb 28 17:58:36 UTC 2016 +# Mon Feb 29 21:58:51 UTC 2016 pkgbase = tlp-pmu pkgdesc = Advanced Power Management for Linux, with pm-utils support pkgver = 0.8 @@ -22,7 +22,6 @@ pkgbase = tlp-pmu optdepends = smartmontools: Display S.M.A.R.T. data in tlp-stat optdepends = tp_smapi: ThinkPad battery functions optdepends = x86_energy_perf_policy: Set energy versus performance policy on x86 processors - optdepends = openrc-core: for using openrc tlp service provides = tlp conflicts = laptop-mode-tools conflicts = tlp |