From 4fad0a5e620764e7372455094de9704b9c1b11ec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Oct 2005 11:13:52 +0000
Subject: land RT 3.4.4 on HEAD

---
 rt/html/Elements/Header | 1 -
 1 file changed, 1 deletion(-)

(limited to 'rt/html/Elements')

diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index b9518dcb7..a2563fee3 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -77,7 +77,6 @@ ONLOAD="
 >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
   <tr> 
-<<<<<<< Header
     <td colspan=2 rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
     <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing</font></td>
     <td align="right" valign="top">
-- 
cgit v1.2.1