From 5109be2d28dd552b74b206d5afdd17848fb8fcb9 Mon Sep 17 00:00:00 2001
From: jhemmelg <jhemmelg@Jeffs-MacBook-Air-2.local>
Date: Sat, 12 Jul 2014 09:29:40 -0500
Subject: [PATCH] ContentManager function signatures updated

---
 IPython/html/static/base/js/contentmanager.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/html/static/base/js/contentmanager.js b/IPython/html/static/base/js/contentmanager.js
index ec08325de..716a5931c 100644
--- a/IPython/html/static/base/js/contentmanager.js
+++ b/IPython/html/static/base/js/contentmanager.js
@@ -15,7 +15,6 @@ define([
         // with the normal file operations.
         //
         // Parameters:
-<<<<<<< HEAD
         //  options: dictionary
         //      Dictionary of keyword arguments.
         //          events: $(Events) instance