From a0a2e6b50096c92de8cea2eba32a71537bc5f2c8 Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sun, 16 Sep 2018 03:15:34 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/hj3yoo/darknet

---
 .gitignore |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbfed65..95c5db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,19 +2,19 @@
 *.dSYM
 *.csv
 *.out
-*.png
 *.so
 mnist/
-data/
 caffe/
 grasp/
 images/
 opencv/
+out/
 convnet/
 decaf/
 submission/
-cfg/
-darknet
+backup/
+build/darknet/*
+!build/darknet/YoloWrapper.cs
 .fuse*
 
 # OS Generated #
@@ -27,3 +27,4 @@
 # CMake #
 cmake-build-debug/
 CMakeLists.txt
+

--
Gitblit v1.10.0