From 7d235247e621bd470e300f2b9135eeebe630f391 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Wed, 10 Oct 2012 13:55:22 -0400
Subject: [PATCH] fix merge conflict

---
 cms/static/js/base.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index d81f3f9f4d..42afe992d5 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -35,8 +35,6 @@ $(document).ready(function() {
     // expand/collapse methods for optional date setters
     $('.set-date').bind('click', showDateSetter);
     $('.remove-date').bind('click', removeDateSetter);
-
-<<<<<<< HEAD
     // add new/delete section
     $('.new-courseware-section-button').bind('click', addNewSection);
     $('.delete-section-button').bind('click', deleteSection);
@@ -44,14 +42,11 @@ $(document).ready(function() {
     // add new/delete subsection
     $('.new-subsection-item').bind('click', addNewSubsection);
     $('.delete-subsection-button').bind('click', deleteSubsection);
-=======
     // add/remove policy metadata button click handlers
     $('.add-policy-data').bind('click', addPolicyMetadata);
     $('.remove-policy-data').bind('click', removePolicyMetadata);
 
     $('.sync-date').bind('click', syncReleaseDate);
->>>>>>> 2cf14ae339aed0150be353cbcac25c377956b7ab
-
 });
 
 function syncReleaseDate(e) {