From 55dc95d6015dfb980a118a3f2aec2c43c773e90a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 28 Apr 2014 15:03:45 -0400
Subject: [PATCH] Fix bug introduced in 67278f5

---
 src/main/java/com/gitblit/wicket/pages/TicketPage.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index a2f105d..aa52d8f 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
@@ -316,9 +316,10 @@
 
 <!-- PATCHSET FRAGMENT -->
 <wicket:fragment wicket:id="patchsetFragment">
-	<div class="row" style="padding: 0px 0px 20px;">
+	<div class="row" style="padding: 0px;">
  		<div class="span12 attribution-border">
-			<div wicket:id="panel"></div>		
+ 			<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
+			<div wicket:id="panel"></div>
 		</div>
 	</div>
 	
@@ -351,9 +352,8 @@
 
 <!-- COLLAPSIBLE PATCHSET (temp) -->
 <wicket:fragment wicket:id="collapsiblePatchsetFragment">
-<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
 <div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;">
-<div class="patch-group">
+<div class="patch-group" style="margin-bottom: 20px;">
    	<div class="accordion-heading">
 		<div class="attribution-patch-pullright">	
 			<div style="padding-bottom: 2px;"> 

--
Gitblit v1.9.1