Removing more conflicts

This commit is contained in:
Anup Rajput
2017-01-23 10:34:26 +05:30
parent 9dbf87a263
commit dac1f42b5e

2
.gitignore vendored
View File

@@ -3,6 +3,8 @@
*.csv *.csv
*.out *.out
*.png *.png
*.jpg
old/
mnist/ mnist/
data/ data/
caffe/ caffe/