From 403a5646483ba98ba607052eba645cc8a93ebb56 2014-11-03 18:18:04
From: jhemmelg <jhemmelg@Jeffs-MacBook-Air-2.local>
Date: 2014-11-03 18:18:04
Subject: [PATCH] Initial interface for javascript contentmanagers

contentmanager.js is going to be a js proxy for the current
filenbmanager.py.  This will allow a contentmanager for Google Drive to
be created.

---

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