From 64a39b87062db22904b97fb82df4d2063ff8ed35 Mon Sep 17 00:00:00 2001
From: David Ray <davidray@gmail.com>
Date: Fri, 28 Feb 2014 12:17:48 -0500
Subject: [PATCH] resolve merge conflict

---
 symposion/templates/schedule/schedule_edit.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index 5de11af2..b5335506 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -24,7 +24,11 @@
                 {% include "schedule/_edit_grid.html" %}
             {% endfor %}
         </div>
-        
+        <form id="schedule-builder" action="." method="post" enctype="multipart/form-data">{% csrf_token %}
+            {{ form.as_p }}
+            <input type="submit" name="submit" value="Submit" />
+            <input type="submit" id="delete" name="delete" value="Delete Schedule" />
+        </form>
         <div class="modal fade hide in" id="slotEditModal"></div>
     </div>
 {% endblock %}