From 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:31:52 -0400
Subject: [PATCH] Merge overrides in addition to merging the normal settings
---
src/main/java/com/gitblit/models/SubmoduleModel.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/models/SubmoduleModel.java b/src/main/java/com/gitblit/models/SubmoduleModel.java
index 47f84b9..15b69d7 100644
--- a/src/main/java/com/gitblit/models/SubmoduleModel.java
+++ b/src/main/java/com/gitblit/models/SubmoduleModel.java
@@ -20,9 +20,9 @@
/**
* SubmoduleModel is a serializable model class that represents a git submodule
* definition.
- *
+ *
* @author James Moger
- *
+ *
*/
public class SubmoduleModel implements Serializable {
@@ -40,7 +40,8 @@
this.path = path;
this.url = url;
}
-
+
+ @Override
public String toString() {
return path + "=" + url;
}
--
Gitblit v1.9.1