From 1b46ac219a33b7beadb373e3d23d4dd4a57e21fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Moso=C5=84?= <mosonkonrad@gmail.com>
Date: Tue, 24 Nov 2015 21:46:02 +0100
Subject: [PATCH] Removed broken conflict lines...

---
 haproxy/templates/haproxy.jinja | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja
index 0360ca5..35d59ff 100644
--- a/haproxy/templates/haproxy.jinja
+++ b/haproxy/templates/haproxy.jinja
@@ -64,11 +64,7 @@ global
     {{- render_list_of_dictionaries('ssl-default-bind-options', salt['pillar.get']('haproxy:global:ssl-default-bind-options')) }}
 {%- endif %}
 
-<<<<<<< HEAD
-{%- for id, userlist in salt['pillar.get']('haproxy:userlists',  {}).items() %}
-=======
 {%- for id, userlist in salt['pillar.get']('haproxy:userlists',  {})|dictsort %}
->>>>>>> Use dictsort instead of iteritems()/items()
 #------------------
 # Global Userlists
 #------------------