From 7a4b9d37b6d536e83eae07e5f7648435856e7e09 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Wed, 18 Jan 2017 03:31:55 -0600
Subject: [PATCH] Update program_entry.html

---
 layouts/shortcodes/program_entry.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/layouts/shortcodes/program_entry.html b/layouts/shortcodes/program_entry.html
index e67eaa4ae..a151c81b9 100644
--- a/layouts/shortcodes/program_entry.html
+++ b/layouts/shortcodes/program_entry.html
@@ -1,9 +1,5 @@
 <!-- this div is repeated for each timeslot -->
-<<<<<<< HEAD
-{{ $path := split .Page.Source.File.Path .Site.Params.PathSeperator }}
-=======
 {{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }}
->>>>>>> 12b193aaf8179c1c32318267861f35f3cdea82e4
 {{ $event_slug := index $path 1 }}
 {{ $e :=  (index $.Site.Data.events $event_slug) }}
 {{ $city_slug := substr $e.name 5 }}