Skip to content

Commit 930584b

Browse files
committed
first export
1 parent b53a328 commit 930584b

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.ipynb merge=nbdev-merge

.gitconfig

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Generated by nbdev_install_hooks
2+
#
3+
# If you need to disable this instrumentation do:
4+
# git config --local --unset include.path
5+
#
6+
# To restore:
7+
# git config --local include.path ../.gitconfig
8+
#
9+
[merge "nbdev-merge"]
10+
name = resolve conflicts with nbdev_fix
11+
driver = nbdev_merge %O %A %B %P

0 commit comments

Comments
 (0)