From f685ea581f94373a63bcdc94ec417fdf92a95d68 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 12:43:59 -0400
Subject: [PATCH] Merge branch 'ticket/129' into develop

---
 src/main/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/.gitignore b/src/main/.gitignore
index 01c48ab..0d04688 100644
--- a/src/main/.gitignore
+++ b/src/main/.gitignore
@@ -1 +1,2 @@
 /dagger
+/gen

--
Gitblit v1.9.1