[rt-commit] [svn] r626 - in rt/branches/rt-3.1: . bin

[jesse at fsck.com]

Author: jesse
Date: Thu Mar 25 21:23:18 2004
New Revision: 626

Modified:
   rt/branches/rt-3.1/   (props changed)
   rt/branches/rt-3.1/bin/rt.in
Log:
Removing a conflict generated by an incorrect commit

Modified: rt/branches/rt-3.1/bin/rt.in
==============================================================================
--- rt/branches/rt-3.1/bin/rt.in	(original)
+++ rt/branches/rt-3.1/bin/rt.in	Thu Mar 25 21:23:18 2004
@@ -148,17 +148,8 @@
             my $title = $item->[2]{Title};
             my @titles = ref $title eq 'ARRAY' ? @$title : $title;
 
-<<<<<<< local
-            foreach $title (@titles) {
-                $help{$title} = $item->[2]{Text};
-            }
-||||||| base
-        foreach $title (@titles) {
-            $help{$title} = $item->[2]{Text};
-=======
         foreach $title (grep $_, @titles) {
             $help{$title} = $item->[2]{Text};
->>>>>>> new
         }
     }