[Rt-commit] r3285 - in rt/branches/3.5-TESTING: . html/Elements

[trs at bestpractical.com]

Author: trs
Date: Fri Jul  1 21:13:02 2005
New Revision: 3285

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/Menu
   rt/branches/3.5-TESTING/html/Elements/PageLayout
Log:
 r4658 at wintermute:  tom | 2005-07-01 21:10:21 -0400
 Fixed merge artifacts


Modified: rt/branches/3.5-TESTING/html/Elements/Menu
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Menu	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Menu	Fri Jul  1 21:13:02 2005
@@ -85,6 +85,7 @@
 % }
 </div>
 </ul>
+
 <%INIT>
 my ($tab, $class, $count);
 

Modified: rt/branches/3.5-TESTING/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/PageLayout	(original)
+++ rt/branches/3.5-TESTING/html/Elements/PageLayout	Fri Jul  1 21:13:02 2005
@@ -123,7 +123,6 @@
 %     }
 % }
 %
-% }
 % if ($subactions) {
 %     my $sep;
 %     if ($count) {