merge with remote

[epclust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 96947f0..67ca303 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /data/*
 !/data/README
 !/data/preprocessing/
+!/data/curves_to_db/
 
 #files generated by initialize.sh
 /.gitfat
@@ -42,3 +43,8 @@
 #misc
 Rprof.out
 *.zip
+.Rproj.user
+*.Rproj
+
+# temp
+/temp/*.xls