reginakim/BRAINSStandAlone — comment on commit 4b867d4d9ff4c9863c5051b65ffa94c2ebdd631d
File: BRAINSCut/Parser.cxx line 337
By Chaircrusher:

This is a merge conflict message that would need cleaning up before a merge.