From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

---
 src/test/config/test-users.conf |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/test/config/test-users.conf b/src/test/config/test-users.conf
index 1d01f84..4361410 100644
--- a/src/test/config/test-users.conf
+++ b/src/test/config/test-users.conf
@@ -2,13 +2,9 @@
 	password = admin
 	cookie = dd94709528bb1c83d08f3088d4043f4742891f4f
 	accountType = LOCAL
+	emailMeOnMyTicketChanges = true
 	role = "#admin"
 	role = "#notfederated"
-[user "sampleuser"]
-	password = sampleuser
-	cookie = 6e07ed42149fc166206319faffdfba2e2ec82e43
-	accountType = LOCAL
-	role = "#none"
 [team "admins"]
 	role = "#none"
 	accountType = LOCAL

--
Gitblit v1.9.1