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

diff --git a/states/termite/files/config b/states/termite/files/config
index 6952209..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 %}
+<<<<<<< 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 %}