ccaum/fog — comment on commit cbe880918465710d53ae1a3574d267b1d298afcc
File: lib/fog/vsphere/requests/compute/list_virtual_machines.rb line 69
By jeffmccune:

It looks like an unresolved merge conflict got merged straight into this topic branch.

This definitely shouldn't be here.