X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fconky%2Ffiles%2Fconkyrc;fp=states%2Fconky%2Ffiles%2Fconkyrc;h=88b5931e4497fd57f3d58d8b0740015e9ba45a25;hb=dda00f31a47b681556a1831ca51287fd1d5a14da;hp=1d6fc965ce4dfaee40633e717a22802e47b1ab0a;hpb=bac28d0ef6374e6cc88f62654564c3c6d31f9587;p=max%2Fsaltfiles.git

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 1d6fc96..88b5931 100644
--- 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":