Skip to content
This repository has been archived by the owner on Jul 21, 2019. It is now read-only.

Commit

Permalink
Clean up some merge messes
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Stratton <[email protected]>
  • Loading branch information
mattstratton committed Jan 18, 2017
1 parent df3c376 commit 6f7683e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion layouts/event/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
{{ else }}
{{ .Content }}
{{ end }}
{{ .Content }}
<!-- need to add else statement for the rest of the content types -->
{{ partial "sponsors.html" . }}

Expand Down
3 changes: 0 additions & 3 deletions layouts/shortcodes/event_map.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
{{ $lat := index $coords 0 }}
{{ $lng := index $coords 1 }}

lat is {{ $lat }}
long is {{ $lng }}

<link href="/css/googlemaps.css" rel="stylesheet">

<div id="map_canvas" style="width: 550px; height: 265px"></div>
Expand Down

0 comments on commit 6f7683e

Please sign in to comment.