Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/authority/AuthorityWorker.java

@@ -35,6 +35,7 @@
      return doRequest();

   }



   @Override

   protected void done() {

      parent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

      try {