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/panels/NavigationPanel.java

@@ -42,6 +42,7 @@
      DataView<PageRegistration> refsView = new DataView<PageRegistration>("navLink", refsDp) {

         private static final long serialVersionUID = 1L;



         @Override

         public void populateItem(final Item<PageRegistration> item) {

            PageRegistration entry = item.getModelObject();

            if (entry.hiddenPhone) {