Cleanup rebase leftover

src/main/bin/ccm-initialise

@@ -127,11 +127,7 @@ MakeCacheRoot($this_app, $cache_root, $dopts);
 
 # make global lock file (mask and GID take care of the permissions)
 $this_app->verbose("Creating lockfile");
-<<<<<<< a5c81c552251e536424fd3de83ed2560cb70e952
 open (my $TMP, '>', "$cache_root/global.lock");
-=======
-open my $TMP, ">$cache_root/global.lock";
->>>>>>> Switch to Test::Quattor::Unittest and address critic remarks
 print $TMP "no\n";
 close $TMP;
 

src/main/bin/ccm-purge

@@ -76,11 +76,7 @@ sub read_cid
     my ($filename) = @_;
     my ($id);
 
-<<<<<<< a5c81c552251e536424fd3de83ed2560cb70e952
     open(my $FILE , '<', $filename) or die("$filename open failed: $!");
-=======
-    open(my $FILE , "$filename") or die("$filename open failed: $!");
->>>>>>> Switch to Test::Quattor::Unittest and address critic remarks
     $id = join("", <$FILE>);
     $id =~ /^(\d+)\n$/ or die("$filename unknown CID format");
     $id = $1;
@@ -172,11 +168,7 @@ sub clean_profile
         return;
     }
 
-<<<<<<< a5c81c552251e536424fd3de83ed2560cb70e952
     while (my $file = readdir($DIR)) {
-=======
-    while ($file = readdir($DIR)) {
->>>>>>> Switch to Test::Quattor::Unittest and address critic remarks
 
         next unless ($file =~ /ccm-active-$profile-(\d+)/);
         my $active_pid = $1;
@@ -235,11 +227,7 @@ sub read_url
     my ($filename) = @_;
     my $url;
 
-<<<<<<< a5c81c552251e536424fd3de83ed2560cb70e952
     open(my $FILE, '<', $filename) or die("$filename failed to open $!");
-=======
-    open(my $FILE, "$filename") or die("$filename failed to open $!");
->>>>>>> Switch to Test::Quattor::Unittest and address critic remarks
     $url = <$FILE>;
     chomp($url) if ($url);
     close($FILE);
@@ -300,11 +288,7 @@ sub clean_temp_dir
 
     opendir(my $DIR , "$TmpDir") or die("$TmpDir open failed $!");
 
-<<<<<<< a5c81c552251e536424fd3de83ed2560cb70e952
     while (my $dir = readdir($DIR)) {
-=======
-    while ($dir = readdir($DIR)) {
->>>>>>> Switch to Test::Quattor::Unittest and address critic remarks
         next if ($dir eq "." or $dir eq "..");
         $mod_time = (stat("$TmpDir/$dir"))[ST_MTIME];
         if ($mod_time + $TimeAging >= $curr_time ) {