Commit of fix of auto-conflict resolved file.
Commit of fix of auto-conflict resolved file.

afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform