Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

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

@@ -145,7 +145,7 @@
               }

               Fragment userFragment = new Fragment("registrant", "userRegistrant", RegistrantPermissionsPanel.this);
               userFragment.add(new GravatarImage("userAvatar", ident, 20, false));
               userFragment.add(new GravatarImage("userAvatar", ident, 20));
               userFragment.add(new Label("userName", entry.registrant));
               item.add(userFragment);
            } else {