Merge branch 'ticket/237' into develop

James Moger

2015-02-11 5ec94c4282ed3630b7b4cd0fb5db62c20ce46d9d

 src/main/java/com/gitblit/servlet/RobotsTxtServlet.java

@@ -18,16 +18,14 @@
import java.io.File;

import java.io.IOException;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import com.gitblit.Keys;

import com.gitblit.Keys.web;

import com.gitblit.Keys.web.robots;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.utils.FileUtils;



@@ -42,11 +40,10 @@


   private static final long serialVersionUID = 1L;



   private final IRuntimeManager runtimeManager;

   private IRuntimeManager runtimeManager;



   @Inject

   public RobotsTxtServlet(IRuntimeManager runtimeManager) {

      super();

      this.runtimeManager = runtimeManager;

   }