Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/Constants.java

@@ -100,7 +100,7 @@


   public static final String HEAD = "HEAD";



   public static final String R_GITBLIT = "refs/gitblit/";

   public static final String R_META = "refs/meta/";



   public static final String R_HEADS = "refs/heads/";