Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.30.2.1 -r1.30.2.2
--- openacs-4/contrib/packages/project-manager/www/one.tcl	20 May 2004 17:30:05 -0000	1.30.2.1
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	20 May 2004 17:35:19 -0000	1.30.2.2
@@ -75,15 +75,9 @@
 
 set original_project_id $project_id
 
-<<<<<<< one.tcl
 # for edits of tasks. We want to come back to here.
-set return_url "[ad_conn url]?[ad_conn query]"
-
-=======
-# for edits of tasks. We want to come back to here.
 set return_url [ad_return_url -qualified]
 
->>>>>>> 1.35
 # --------------------------------------------------------------- #
 
 # the unique identifier for this package
@@ -249,26 +243,13 @@
         }
     } \
     -orderby {
-<<<<<<< one.tcl
         default_value latest_start,asc
         title {
             label "Subject"
             orderby_asc "title asc"
             orderby_desc "title desc"
             default_direction asc
         }
-        earliest_start {orderby earliest_start}
-        earliest_finish {orderby earliest_finish}
-        latest_start {orderby latest_start}
-        latest_finish {orderby latest_finish}
-=======
-        default_value latest_start,asc
-        title {
-            label "Subject"
-            orderby_asc "title asc"
-            orderby_desc "title desc"
-            default_direction asc
-        }
         earliest_start {
             label "Earliest start"
             orderby_asc "earliest_start, u.first_names, u.last_name"
@@ -290,7 +271,6 @@
             orderby_desc "latest_finish desc, u.first_names, u.last_name"
             default_direction asc
         }
->>>>>>> 1.35
     } \
     -orderby_name orderby_tasks \
     -html {