summaryrefslogtreecommitdiff
path: root/rt/html/Elements
diff options
context:
space:
mode:
authorivan <ivan>2005-10-15 11:13:52 +0000
committerivan <ivan>2005-10-15 11:13:52 +0000
commit4fad0a5e620764e7372455094de9704b9c1b11ec (patch)
tree13f802bc137521833462c2292d121024c3f5b507 /rt/html/Elements
parent6863b061a7740eed16903f01dae6b46521e9ca7b (diff)
land RT 3.4.4 on HEAD
Diffstat (limited to 'rt/html/Elements')
-rw-r--r--rt/html/Elements/Header1
1 files changed, 0 insertions, 1 deletions
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index b9518dc..a2563fe 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">