Merged #33 "Merge overrides in addition to merging the normal settings"

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

 src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java

@@ -80,7 +80,7 @@
   protected String getPageName() {

      return getString("gb.diff");

   }

	


   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return TreePage.class;