Configure for barium

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