From 8383a53de200b231b029daadaf0ca9abe7d2b91d Mon Sep 17 00:00:00 2001
From: Alex Leith <alexgleith@gmail.com>
Date: Mon, 14 Mar 2016 10:38:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'shane-axiom/master'

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

diff --git a/.gitignore b/.gitignore
index f5017bf..245321d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-resources/geoserver.zip
-resources/plugins/*.zip
+resources/*
+!resources/plugins/
+resources/plugins/*
+!resources/plugins/README.txt
+!resources/overlays/
+resources/overlays/*
+!resources/overlays/README.txt
 .idea

--
Gitblit v0.0.0-SNAPSHOT