From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 17 Jun 2013 08:04:19 +0000 (+0200)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/e724e4d7cf44ecd4b3f706678fa14f5bfe9b0879?ds=sidebyside

Merge branch 'master' of tardis:/dotfiles

Conflicts:
	awesome/topbar.lua
---

e724e4d7cf44ecd4b3f706678fa14f5bfe9b0879
diff --cc awesome/topbar.lua
index 5f50ec8,7906402..587bfc4
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@@ -5,9 -5,10 +5,10 @@@ local utils = require("utils"
  local wibox = require("wibox")
  
  -- my widgets
 -local volume_widget  = require("widgets/volume_widget")
 +local volume_widget = require("widgets/volume_widget")
+ local battery_widget = { }
  if utils.host == "chronos" then
-     local battery_widget = require("widgets/battery_widget")
+     battery_widget = require("widgets/battery_widget")
  end
  local network_widget = require("widgets/network_widget")