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/wicket/pages/ProjectsPage.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectsPage.html b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.html
index 528ed48..2d446ec 100644
--- a/src/main/java/com/gitblit/wicket/pages/ProjectsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.html
@@ -6,7 +6,7 @@
<body>
<wicket:extend>
- <div class="markdown" style="padding-bottom:5px;" wicket:id="projectsMessage">[projects message]</div>
+<div class="container">
<table class="repositories">
<thead>
@@ -31,7 +31,7 @@
</tr>
</tbody>
</table>
-
+</div>
</wicket:extend>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1