Fix conkyrc

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 1d6fc965ce4dfaee40633e717a22802e47b1ab0a..88b5931e4497fd57f3d58d8b0740015e9ba45a25 100644 (file)
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -5,7 +5,7 @@
 {% elif grains['host'] == 'platinum' %}
        {% set ifdev = ['wlp2s0'] %}
 {% elif grains['host'] == 'barium' %}
-       {% set ifdev = ['enp5s0'] %}
+       {% set ifdev = ['enp6s0'] %}
 {% elif grains['host'] == 'dubnium' %}
        {% set ifdev = ['enp4s0'] %}
 {% elif grains['host'] == 'rhenium' %}
@@ -68,11 +68,7 @@ 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":