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
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
                 my $f2 = $f;
                 # the initial (.*) is a hack to make the regexp match the last occurance in the path string rather than earlier ones
-<<<<<<< .merge_file_4zqmrn
-                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)
-=======
                 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)
->>>>>>> .merge_file_aXWKyv
                 {
                         &say(BOLD, RED, ">> not applicable for $f", RESET);
                         next;