From f396403bb60a6fa7bb3d482e23d646a39e254a1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 07 Dec 2016 16:37:49 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet

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

diff --git a/.gitignore b/.gitignore
index 9057c39..fd44ca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 *.csv
 *.out
 *.png
-*.sh
 mnist/
 data/
 caffe/
@@ -15,6 +14,7 @@
 submission/
 cfg/
 darknet
+.fuse*
 
 # OS Generated #
 .DS_Store*

--
Gitblit v1.10.0