Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java

@@ -33,6 +33,7 @@
      add(new Label("commitid"));

      add(new Label("author"));

      add(new Label("date"));

      add(new Label("authorAvatar"));

   }



   public CommitHeaderPanel(String id, String repositoryName, RevCommit c) {