init.huawei.rc: wtf

dazjo · Apr 28, 2013 · 56691cc · 56691cc
1 parent 051c7d4
commit 56691cc
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/ramdisk/init.huawei.rc b/ramdisk/init.huawei.rc
@@ -172,8 +172,6 @@ service rmt_storage /system/bin/rmt_storage /dev/block/mmcblk0p10 /dev/block/mmc
     user root
     disabled
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 service hciattach /system/bin/sh /system/etc/bluetooth/init.bcm.bt.sh
     class main
     user bluetooth