Author: infinoid
Date: Mon Jan 5 07:20:12 2009
New Revision: 34989
Modified:
trunk/lib/Parrot/Configure.pm
Log:
Clean up an old, commented out merge conflict in Parrot::Configure.
Modified: trunk/lib/Parrot/Configure.pm
==============================================================================
--- trunk/lib/Parrot/Configure.pm (original)
+++ trunk/lib/Parrot/Configure.pm Mon Jan 5 07:20:12 2009
@@ -238,13 +238,8 @@
# We make certain that argument to --fatal-step is a comma-delimited
# string of configuration steps, each of which is a string delimited by
# two colons, the first half of which is one of init|inter|auto|gen
-#<<<<<<< .working
elsif ( defined ( $fatal_step_str ) ) {
%steps_to_die_for = _handle_fatal_step_option( $fatal_step_str );
-#=======
-# elsif ( defined ( $fatal_step ) ) {
-# %steps_to_die_for = $conf->_handle_fatal_step_option( $fatal_step );
-#>>>>>>> .merge-right.r30499
}
else {
# No action needed; this is the default case where no step is fatal
