[freeside-commits] freeside/rt/html/Elements Header,1.7,1.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/html/Elements
In directory wavetail:/tmp/cvs-serv8523/rt/html/Elements

Modified Files:
	Header 
Log Message:
land RT 3.4.4 on HEAD

Index: Header
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Header,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Header	15 Oct 2005 09:33:53 -0000	1.7
+++ Header	15 Oct 2005 11:13:52 -0000	1.8
@@ -77,7 +77,6 @@
 >
 <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">