X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Ftermite%2Ffiles%2Fconfig;h=683912c63de38f1e63dec86a88ac4df2ac91b7f1;hb=8a1f4ad81527dfeacf0178629c76e6531f92eede;hp=b334965145a5e6879d0171c23535580e18fbfd31;hpb=aadf625b59e7258fe26a942bf8b2ed05d2bbaae8;p=max%2Fsaltfiles.git

diff --git a/states/termite/files/config b/states/termite/files/config
index b334965..683912c 100644
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,6 +1,10 @@
 {% if grains['host'] in ['rhenium', ] %}
 	{% set font_size = 16 %}
-{% elif grains['host'] in ['dubnium', ] %}
+<<<<<<< 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 %}