Skip to content

Commit

Permalink
make merge executable
Browse files Browse the repository at this point in the history
  • Loading branch information
Carreau committed Aug 25, 2012
1 parent 17794f5 commit aa6a0ac
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions docs/examples/notebooks/merge.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env python
# coding: utf-8
from IPython.nbformat import current as nbf
from difflib import context_diff, ndiff, unified_diff
Expand Down

0 comments on commit aa6a0ac

Please sign in to comment.