diff options
author | psyc://psyced.org/~lynX <ircs://psyced.org/youbroketheinternet> | 2016-08-10 15:29:01 +0000 |
---|---|---|
committer | psyc://psyced.org/~lynX <ircs://psyced.org/youbroketheinternet> | 2016-08-10 15:29:01 +0000 |
commit | fceda6b6f0a2468b4f67e855f1c94b3511fb9dc8 (patch) | |
tree | 10cb66cc8290548f28dca941957723505a373558 | |
parent | 1bb9ec08c78b17289d4de72732c7821cf1dcbc49 (diff) | |
download | perlpsyc-master.tar.gz perlpsyc-master.zip |
-rwxr-xr-x | bin/psycamp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/psycamp b/bin/psycamp index eaae14c..1ecfff2 100755 --- a/bin/psycamp +++ b/bin/psycamp | |||
@@ -658,11 +658,7 @@ X | |||
658 | $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!; | 658 | $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!; |
659 | my $f2 = $f; | 659 | my $f2 = $f; |
660 | # the initial (.*) is a hack to make the regexp match the last occurance in the path string rather than earlier ones | 660 | # the initial (.*) is a hack to make the regexp match the last occurance in the path string rather than earlier ones |
661 | <<<<<<< .merge_file_4zqmrn | ||
662 | unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|COOL|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i) | ||
663 | ======= | ||
664 | unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|QUIET|COOL|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i) | 661 | unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|QUIET|COOL|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i) |
665 | >>>>>>> .merge_file_aXWKyv | ||
666 | { | 662 | { |
667 | &say(BOLD, RED, ">> not applicable for $f", RESET); | 663 | &say(BOLD, RED, ">> not applicable for $f", RESET); |
668 | next; | 664 | next; |