Configure for barium

[max/saltfiles.git] / states / conky / files / conkyrc

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 27f9996595d1e4daf981de8d779e01df0fe6b440..1d6fc965ce4dfaee40633e717a22802e47b1ab0a 100644 (file)
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -68,7 +68,11 @@ conky.text = [[
                "\#ff0000"
          ${endif} 
   },
+<<<<<<< HEAD
+{% if grains['host'] in ['platinum', 'rhenium', 'barium'] %}
+=======
 {% if grains['host'] in ['platinum', 'rhenium'] %}
+>>>>>>> 369e162 (Configure for barium)
        {
          "full_text": "BAT ${battery_short} ${battery_time}", 
          "color":