From dac1f42b5e8fb1ad03b7978ed54c66bc0f07dd0f Mon Sep 17 00:00:00 2001
From: Anup Rajput <adroit.91@gmail.com>
Date: Mon, 23 Jan 2017 10:34:26 +0530
Subject: [PATCH] Removing more conflicts

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index fd44ca29..2299a477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 *.csv
 *.out
 *.png
+*.jpg
+old/
 mnist/
 data/
 caffe/