Fix merge conflict

PhysicsAnalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh

@@ -271,10 +271,7 @@ echo
 echo "Submit job:"
 echo faser_ntuple_maker.py $last_file_str $partialstr $tagstr $ismc --slice $slice --files $nfiles $mergestr "$@" $dir_path 
 echo
-<<<<<<< HEAD
 #
-=======
->>>>>>> origin/master
 faser_ntuple_maker.py $last_file_str $partialstr $tagstr $ismc --slice $slice --files $nfiles $mergestr "$@" $dir_path 
 ntup_code=$?
 echo "Return code: $ntup_code"