Configure for barium

[max/saltfiles.git] / states / termite / files / config

diff --git a/states/termite/files/config b/states/termite/files/config
index c795eb1d0cc66cea0cc6f599fbdef0bd115e3390..683912c63de38f1e63dec86a88ac4df2ac91b7f1 100644 (file)
--- 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 %}