mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-15 04:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pierre Gerold 2015-12-07 12:10:18 +01:00
parent c218ff25f7
commit 6ba2104c4b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notebook/services/contents/fileio.py
View File

@ -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).