resolve merge issue with sample map

ETH-NEXUS · Aug 13, 2024 · d7e9414 · d7e9414
1 parent c3f5f83
commit d7e9414
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/config/sample_map.tsv b/config/sample_map.tsv
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-sample
-SAMPLENAME1
-SAMPLENAME2
-=======
 sample_name	file_stem
 SAMPLE-1_scR	technical_long_sample.name.vXX_without_restrictions
->>>>>>> Added feature to automatically create symlinks to work around cellranger filename restrictions