Skip to content

Commit

Permalink
update git ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
bvasiles committed Mar 5, 2013
1 parent fc6f387 commit 60531e3
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
.DS_Store
<<<<<<< HEAD
data/*
=======

fse2013/tools/r/.Rhistory
>>>>>>> update git ignore

0 comments on commit 60531e3

Please sign in to comment.