Update Ponykart++-linux.cbp
Fixed merge conflict