From 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:31:52 -0400
Subject: [PATCH] Merge overrides in addition to merging the normal settings

---
 src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html
index ce1f028..b55688c 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html
@@ -8,10 +8,10 @@
 <wicket:extend>
 <div class="container">
 
-	<div class="row" style="padding-top:5px;">
+	<div class="row" style="padding-top:10px;">
 		<div class="span7">
-			<div class="hidden-phone hidden-tablet markdown" style="padding-bottom: 30px;" wicket:id="repositoriesMessage">[repositories message]</div>
-			<div wicket:id="activity"></div>
+			<div class="hidden-phone hidden-tablet markdown" style="padding-bottom: 10px;" wicket:id="repositoriesMessage">[repositories message]</div>
+			<div ng-non-bindable wicket:id="activity"></div>
 		</div>
 		<div class="span5">
 			<div wicket:id="repositoryTabs"></div>

--
Gitblit v1.9.1