aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDenny <dennybritz@gmail.com>2012-08-02 16:00:33 -0700
committerDenny <dennybritz@gmail.com>2012-08-02 16:00:33 -0700
commit0008994044ca0d40facc489cbcd0371a66e7630f (patch)
tree536240b872167b00deb696322bc4a4f70c66d21a /.gitignore
parent53008c2d8a8b28f4204eaafa89f0e8087dc11466 (diff)
parent71a958b0b7f628fefa82c1c2284369a6a557fa7b (diff)
downloadspark-0008994044ca0d40facc489cbcd0371a66e7630f.tar.gz
spark-0008994044ca0d40facc489cbcd0371a66e7630f.tar.bz2
spark-0008994044ca0d40facc489cbcd0371a66e7630f.zip
merged dev branch
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 648b6bd0a8..d486f58db5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@ project/build/target/
project/plugins/target/
project/plugins/lib_managed/
project/plugins/src_managed/
-logs/ \ No newline at end of file
+logs/
+log/