Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

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

@@ -23,11 +23,11 @@
public class UsersPage extends RootPage {



   public UsersPage() {

      super();		
      super();

      setupPage("", "");



      add(new TeamsPanel("teamsPanel", showAdmin).setVisible(showAdmin));

		


      add(new UsersPanel("usersPanel", showAdmin).setVisible(showAdmin));

   }

}