Index: openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-manager-procs.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl	20 May 2004 17:30:04 -0000	1.2.2.1
+++ openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl	20 May 2004 17:35:19 -0000	1.2.2.2
@@ -27,7 +27,6 @@
         return $value_if_not_null
     }
 }
-<<<<<<< project-manager-procs.tcl
 
 
 ad_proc -public pm::util::string_truncate_and_pad {
@@ -60,41 +59,8 @@
 
     return $new_string
 }
-=======
 
 
-ad_proc -public pm::util::string_truncate_and_pad {
-    -length
-    {-ellipsis "..."}
-    -string
-} {
-    Truncates a string to a given length, or pads it to match a given length
-    
-    @author Jade Rubick (jader@bread.com)
-    @creation-date 2004-04-14
-    
-    @param length
-
-    @param ellipsis
-
-    @param string
-
-    @return 
-    
-    @error 
-} {
-
-    set new_string [string_truncate -len $length -ellipsis $ellipsis -- $string]
-    set new_string_length [string length $new_string]
-
-    if {$new_string_length < $length} {
-        set new_string "$new_string[string repeat " " [expr $length - $new_string_length]]"
-    }
-
-    return $new_string
-}
-
-
 ad_proc -private pm::util::word_diff {
 	{-old:required}
 	{-new:required}