From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 13 May 2022 08:36:14 +0000 (+0100)
Subject: Configure for barium
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=bac28d0ef6374e6cc88f62654564c3c6d31f9587;p=max%2Fsaltfiles.git

Configure for barium
---

diff --git a/states/termite/files/config b/states/termite/files/config
index 683912c..6952209 100644
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,10 +1,6 @@
 {% if grains['host'] in ['rhenium', ] %}
 	{% set font_size = 16 %}
-<<<<<<< HEAD
-{% elif grains['host'] in ['dubnium'] %}
-=======
 {% elif grains['host'] in ['dubnium', 'barium'] %}
->>>>>>> 369e162 (Configure for barium)
 	{% set font_size = 13 %}
 {% else %}
 	{% set font_size = 11 %}