Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/tickets/FileTicketService.java

@@ -25,8 +25,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;

import javax.inject.Inject;

import org.eclipse.jgit.lib.Repository;

import com.gitblit.Constants;
@@ -58,7 +56,6 @@

   private final Map<String, AtomicLong> lastAssignedId;

   @Inject
   public FileTicketService(
         IRuntimeManager runtimeManager,
         INotificationManager notificationManager,