Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/models/UserRepositoryPreferences.java

@@ -19,7 +19,7 @@

/**
 * User repository preferences.
 * 
 *
 * @author James Moger
 *
 */
@@ -28,11 +28,11 @@
   private static final long serialVersionUID = 1L;

   public String username;
	

   public String repositoryName;
	

   public boolean starred;
	

   @Override
   public String toString() {
      return username + ":" + repositoryName;