Conflicted files committed to fastashs branch

[cookpa]

I'm trying to build from source, and found these

ashs/src/LabelFusion/WeightedVotingLabelFusionImageFilter.h

Lines 220 to 225 in 7eaead9

	<<<<<<< HEAD
	// Array of weight map data pointers - for faster access
	float **m_WeightMapArrayBuffer;
	=======
	>>>>>>> 515ff7c2f50928adabc4e64bded9a7e76fc750b1

There's also conflicts in WeightedVotingLabelFusionImageFilter.txx. I'm not sure how to resolve

[pyushkevich]

Try now, Phil - it should compile Thanks!

…

On Wed, Jun 15, 2022 at 9:17 AM Philip Cook ***@***.***> wrote: I'm trying to build from source, and found these https://github.com/pyushkevich/ashs/blob/7eaead92427acd4f56a083cecfd9761a5efc4e8f/src/LabelFusion/WeightedVotingLabelFusionImageFilter.h#L220-L225 There's also conflicts in WeightedVotingLabelFusionImageFilter.txx. I'm not sure how to resolve — Reply to this email directly, view it on GitHub <#4>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAJPEW3HNR3WQOG6QQNP54LVPHJU7ANCNFSM5Y3IVUDQ> . You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

[cookpa]

Looks like there's one left over

ashs/src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx

Line 271 in b113c60

>>>>>>> 515ff7c2f50928adabc4e64bded9a7e76fc750b1