Remove git conflict markers from workflow - #2

Remove git conflict markers from workflow#2

chnorton wants to merge 1 commit into

andyrichardson:masterandyrichardson/nix-node:masterfrom

fontis:fix_conflict_markersfontis/nix-node:fix_conflict_markersCopy head branch name to clipboard