fixes to layout from master and cherry-pick

marbl · Nov 20, 2023 · 1fc55f3 · 1fc55f3
1 parent b607901
commit 1fc55f3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/scripts/get_layout_from_mbg.py b/src/scripts/get_layout_from_mbg.py
@@ -294,10 +294,7 @@ def get_exact_match_length(clusters):
 			sys.stderr.write(pathname + "\t" + pathstr + "\n")
 
 		contig_pieces[fullname].append("end")
-<<<<<<< HEAD
 
-=======
->>>>>>> a1a44ec (some more layoutContigs comments)
 #map from node to list of contigs where it occures
 node_poses = {}
 for contigname in contig_nodeseqs: