From 7d8e3a08b83134d1a13328ea7fd49dc9da498b23 Mon Sep 17 00:00:00 2001 From: Burung Hantu Date: Fri, 10 Jul 2015 03:03:59 +0200 Subject: [PATCH] code fix --- index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/index.html b/index.html index 0629060c..6fe360da 100644 --- a/index.html +++ b/index.html @@ -627,11 +627,7 @@ Chrome on iOS, Internet Explorer and Safari does not implement

uBlock Origin is an lightweight and efficient blocker: easy on memory and CPU footprint. The extension has no monetization strategy and development is volunteered. OS: Firefox, Safari, Opera, Chromium. AdBlock Plus is not recommended because they show "acceptable ads". The system behind that white list is lacking transparency.
-<<<<<<< HEAD https://addons.mozilla.org/en/firefox/addon/ublock-origin/ -======= -https://addons.mozilla.org/de/firefox/addon/ublock-origin/ ->>>>>>> origin/master