From 22a9488e3ce4d9b5df4fab513d633e701a91de5a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 13 Aug 2012 16:29:02 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/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