Bugfix.

jupyter · Mar 15, 2016 · 6cd8523 · 6cd8523
1 parent 6660a4a
commit 6cd8523
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/nbdime/merging/notebooks.py b/nbdime/merging/notebooks.py
@@ -48,10 +48,10 @@ def merge_notebooks(base, local, remote, args):
 
     # Execute a generic merge operation
     merged, local_diffs, remote_diffs = merge_with_diff(base, local, remote, local_diffs, remote_diffs)
-    merged = nbformat.from_dict(merged)
 
     # Try to resolve conflicts based on behavioural options
     resolved, local_diffs, remote_diffs = \
       autoresolve_notebook_conflicts(merged, local_diffs, remote_diffs, args)
 
+    resolved = nbformat.from_dict(resolved)
     return resolved, local_diffs, remote_diffs