From afbcba32133f1c85ef50a6515fabad2aa745b614 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 29 Sep 2014 10:01:35 -0400
Subject: [PATCH] Merge branch 'ticket/192' into develop

---
 src/main/java/com/gitblit/servlet/LogoServlet.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gitblit/servlet/LogoServlet.java b/src/main/java/com/gitblit/servlet/LogoServlet.java
index 489e98b..d5d298b 100644
--- a/src/main/java/com/gitblit/servlet/LogoServlet.java
+++ b/src/main/java/com/gitblit/servlet/LogoServlet.java
@@ -21,8 +21,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

--
Gitblit v1.9.1