From dda00f31a47b681556a1831ca51287fd1d5a14da Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 31 May 2022 08:13:24 +0100
Subject: [PATCH] Fix conkyrc

---
 states/conky/files/conkyrc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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": 
-- 
2.45.2