From d402f4ef29fc4b2b6a6376d03211b2941b77d72d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 17 Sep 2014 16:16:16 -0400
Subject: [PATCH] Merged #183 "Fix bug in migrating to BranchTicketService"

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

diff --git a/.gitignore b/.gitignore
index e93e18e..6c262bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,29 @@
-/temp
-/lib
-/ext
-/build
-/keystore
-/*.zip
-/gitblit.properties
-/users.properties
-/site
-/git
-/target
-/build.properties
-/war
-/*.war
-/proposals
-/*.jar
-/federation.properties
-/mailtest.properties
-/.settings/*.prefs
-/src/WEB-INF/reference.properties
-/bin/
-/.settings/
-/javadoc
-/express
-/build-demo.xml
-/users.conf
-*.directory
+/temp
+/lib
+/ext
+/build
+/site
+/git
+/build.properties
+/federation.properties
+/mailtest.properties
+/test-users.conf
+/.settings/
+/src/main/java/reference.properties
+/src/main/java/WEB-INF/reference.properties
+/bin/
+/build-demo.xml
+*.directory
 /.gradle
-/projects.conf
+/pom.xml
+/x509test
+/data
+/*.conf
+/build-next.xml
+/*.ps1
+/*.sh
+/*.factorypath
+/src/main/dagger
+/**/.idea
+/**/init.lua
+/**/session

--
Gitblit v1.9.1