raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a merge issue

Browse Source
This commit is contained in:
Will Marshall
2014-06-06 17:23:28 +10:00
parent a87361d82e
commit 7953ff145c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/map/index.html.haml
View File

@@ -1,9 +1,3 @@
<<<<<<< HEAD
- content_for :scripts do
%script{src: "//maps.googleapis.com/maps/api/js?sensor=false"}
=======
>>>>>>> master
= inject_json "enterprisesForMap" , "enterprises_for_map", collection: @enterprises
.ofn-map-container{"fill-vertical" => true}