ContentManager function signatures updated

12 years ago · 5109be2d28
parent 496fa1901f
commit 5109be2d28
1 changed files with 0 additions and 1 deletions
--- 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