From a44004109e29283ec1eda959c6d480ebb80c5de6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 24 Aug 2012 13:07:14 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/ds5apn/gitblit

---
 src/com/gitblit/IUserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/IUserService.java b/src/com/gitblit/IUserService.java
index 78b6e2f..8822d02 100644
--- a/src/com/gitblit/IUserService.java
+++ b/src/com/gitblit/IUserService.java
@@ -84,7 +84,7 @@
 	 * @param model
 	 * @return cookie value
 	 */
-	char[] getCookie(UserModel model);
+	String getCookie(UserModel model);
 
 	/**
 	 * Authenticate a user based on their cookie.

--
Gitblit v1.9.1