finish the merge ... yeh I missed a <<<<<<<HEAD ...

11 years ago · 6ba2104c4b
parent c218ff25f7
commit 6ba2104c4b
1 changed files with 0 additions and 4 deletions
--- a/notebook/services/contents/fileio.py
+++ b/notebook/services/contents/fileio.py
@ -104,11 +104,7 @@ def atomic_writing(path, text=True, encoding='utf-8', log=None, **kwargs):


@contextmanager
-<<<<<<< HEAD
 def _simple_writing(path, text=True, encoding='utf-8', log=None, **kwargs):
-=======
-def _simple_writing(path, text=True, encoding='utf-8', **kwargs):
->>>>>>> master
    """Context manager to write file without doing atomic writing
    ( for weird filesystem eg: nfs).