resolved merge conflict

2 files changed, 3 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b97d404158d..a39a29d8b6a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 59b6bf158031..66b22c733887 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,8 @@ optdepends=('acpi_call: Sandy Bridge and newer ThinkPad battery functions'
             'smartmontools: Display S.M.A.R.T. data in tlp-stat'
             'tp_smapi: ThinkPad battery functions'
             'x86_energy_perf_policy: Set energy versus performance policy on x86 processors'
-            'openrc-core: for using openrc tlp service')
+          # 'openrc-core: for using openrc tlp service'
+)
 conflicts=('laptop-mode-tools' 'tlp')
 provides=($_pkgname)
 backup=('etc/default/tlp')