From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/models/GravatarProfile.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/models/GravatarProfile.java b/src/main/java/com/gitblit/models/GravatarProfile.java
index aa128ce..ec1aeea 100644
--- a/src/main/java/com/gitblit/models/GravatarProfile.java
+++ b/src/main/java/com/gitblit/models/GravatarProfile.java
@@ -20,9 +20,9 @@
/**
* Represents a Gravatar profile.
- *
+ *
* @author James Moger
- *
+ *
*/
public class GravatarProfile implements Serializable {
@@ -35,7 +35,7 @@
public String preferredUsername;
public String currentLocation;
public String aboutMe;
-
+
public String profileUrl;
public String thumbnailUrl;
public List<ProfileObject> photos;
--
Gitblit v1.9.1