Changeset 2560 in /cluster/svnroot


Ignore:
Timestamp:
Aug 7, 2010 3:11:05 PM (10 years ago)
Author:
skylar
Message:

missed a merge conflict (#427)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar-devel/bin/build_livecd.pl

    r2559 r2560  
    103103Readonly my @TIME           => localtime();
    104104Readonly my $FORMAT_DATE    => ($TIME[5]+1900)."-".($TIME[4]+1)."-".$TIME[3];
    105 <<<<<<< .working
    106105Readonly my $SPLASH_FILE    => 'bccd_logo_new.png';
    107106Readonly my @MINIRT_MODS    => (
Note: See TracChangeset for help on using the changeset viewer.