Fixed bug in merge: improper use of force and failing on FORCED result

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

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

@@ -93,6 +93,9 @@
      if (app().settings().getBoolean(Keys.web.useResponsiveLayout, true)) {

         add(CSSPackageResource.getHeaderContribution("bootstrap/css/bootstrap-responsive.css"));

      }

      if (app().settings().getBoolean(Keys.web.hideHeader, false)) {

         add(CSSPackageResource.getHeaderContribution("hideheader.css"));

      }

   }



   protected String getCanonicalUrl() {