From a6e466a9947d8319dc1e5b1b7a9cf405c84166f1 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Wed, 21 Feb 2018 22:03:29 +0000
Subject: Clean vifm configuration

---
 i3/.config/i3blocks/bin/battery | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'i3/.config')

diff --git a/i3/.config/i3blocks/bin/battery b/i3/.config/i3blocks/bin/battery
index b345f16..d475741 100755
--- a/i3/.config/i3blocks/bin/battery
+++ b/i3/.config/i3blocks/bin/battery
@@ -7,22 +7,10 @@ fi
 
 output="$(acpi -b)"
 remaining_time=$(echo "$output" | grep -o "[0-9][0-9]:[0-9][0-9]")
-<<<<<<< HEAD
-
-if [ -d /sys/class/power_supply/BAT0 ]; then
-    now_charge=$(cat /sys/class/power_supply/BAT0/now_charge)
-    full_charge=$(cat /sys/class/power_supply/BAT0/full_charge)
-    charge=$(( (100*now_charge) / full_charge ))
-else
-    echo ""
-    exit
-fi
-=======
 now_charge=$(cat /sys/class/power_supply/BAT0/now_charge)
 full_charge=$(cat /sys/class/power_supply/BAT0/full_charge)
 charge=$(( (100*now_charge) / full_charge ))
 # charge=$(echo "$output" | grep -oP "..(?=%)")
->>>>>>> de29d3a... Add minor updates
 
 if grep -q "Discharging" <(echo "$output"); then
     remaining_time=$(echo "$output" | grep -oP "..:..(?=:.. remaining)")
-- 
cgit v1.2.3