raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup merge

Browse Source
This commit is contained in:
Rafael Schouten
2014-09-25 19:47:00 +10:00
parent 55f4415c0d
commit 04c5dff497
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/producers/index.html.haml
View File

@@ -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