Skip to content

Commit

Permalink
reconciling gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
@jet08013
jet08013 committed Jul 9, 2018
1 parent 8ef7ac4 commit 8bcf1f1
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,8 @@ TSWLatexianTemp*
# generated if using elsarticle.cls
*.spl

<<<<<<< HEAD
#
.ipynb_checkpoints/
=======
.ipynb_checkpoints/
.vscode/
>>>>>>> develop

# emacs
*~

0 comments on commit 8bcf1f1

Please sign in to comment.