summaryrefslogtreecommitdiff
path: root/rootdir/etc/init.target.rc
diff options
context:
space:
mode:
Diffstat (limited to 'rootdir/etc/init.target.rc')
-rwxr-xr-xrootdir/etc/init.target.rc4
1 files changed, 0 insertions, 4 deletions
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 3a234ae..60cfd9f 100755
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -172,11 +172,7 @@ service calibacc /system/bin/accelcal
on property:sys.sensors.acc=*
start calibacc
-<<<<<<< HEAD
-=======
on property:sys.boot_completed=1
# Temp hack to fix torch not being registered on boot
restart media
-
->>>>>>> 80d5451... Try to fix disappearing torch tile by restarting media service after phone is fully booted