tree 72347202a993b2d6fa9c677c4914b00289b35fd9
parent 203b01c1fba177600f1abafa98c3a3a69ad5002b
author Christopher Guindon <chris.guindon@eclipse.org> 1402495421 -0400
committer Christopher Guindon <chris.guindon@eclipse.org> 1402495421 -0400

fix parsing error with last merge conflict.

Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>