Skip to content

Commit ae2dc17

Browse files
trevorcampbelltrevorcampbell
committed
fixed broken merge in gitignore
1 parent d305f2c commit ae2dc17

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,5 @@
55
**.DS_Store
66
*.sw*
77
_bookdown_files
8-
<<<<<<< HEAD
98
**.ipynb_checkpoints
10-
=======
119
.rstudio/*
12-
>>>>>>> dev

0 commit comments

Comments
 (0)