From 04c5dff497c0f9b286f2ca7ab408e9bc50fca8f5 Mon Sep 17 00:00:00 2001
From: Rafael Schouten <rafaelschouten@gmail.com>
Date: Thu, 25 Sep 2014 19:47:00 +1000
Subject: [PATCH] fixup merge

---
 app/views/producers/index.html.haml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/views/producers/index.html.haml b/app/views/producers/index.html.haml
index 371c873f64..cf5bd4bed9 100644
--- a/app/views/producers/index.html.haml
+++ b/app/views/producers/index.html.haml
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 = inject_enterprises 
 .producers.pad-top{"ng-controller" => "EnterprisesCtrl"}
-=======
-= inject_enterprises
-.producers.pad-top{"ng-controller" => "ProducersCtrl"}
->>>>>>> master
   .row
     .small-12.columns.pad-top
       %h1 Find local producers