From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 17 Mar 2014 09:36:09 -0400 Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings" --- src/main/java/com/gitblit/models/GitNote.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/models/GitNote.java b/src/main/java/com/gitblit/models/GitNote.java index c333a88..90b9a81 100644 --- a/src/main/java/com/gitblit/models/GitNote.java +++ b/src/main/java/com/gitblit/models/GitNote.java @@ -21,9 +21,9 @@ * GitNote is a serializable model class that represents a git note. This class * retains an instance of the RefModel which contains the commit in which this * git note was created. - * + * * @author James Moger - * + * */ public class GitNote implements Serializable { -- Gitblit v1.9.1