From eb46166f1130d6c6fb5d41d6090a86b35d1542fc Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Thu, 06 Sep 2018 17:31:12 +0000
Subject: [PATCH] merge resolution

---
 .gitignore |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12d2c99..f7d686d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,21 @@
 *.dSYM
 *.csv
 *.out
+*.png
+*.so
 mnist/
+data/
+caffe/
+grasp/
 images/
 opencv/
 convnet/
 decaf/
 submission/
-darknet
+backup/
+build/darknet/*
+!build/darknet/YoloWrapper.cs
+.fuse*
 
 # OS Generated #
 .DS_Store*
@@ -16,3 +24,7 @@
 Icon?
 Thumbs.db
 *.swp
+
+# CMake #
+cmake-build-debug/
+CMakeLists.txt

--
Gitblit v1.10.0