Skip to content

Commit

Permalink
Missed line in merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: JJ Asghar <[email protected]>
  • Loading branch information
JJ Asghar committed Jun 1, 2018
1 parent 4257453 commit 383775a
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions lib/chef/provisioning/vsphere_driver/driver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -732,8 +732,6 @@ def clone_vm(action_handler, bootstrap_options, machine_spec)
allowGuestControl: true
)

allowGuestControl: true)

)
]
)
Expand Down

0 comments on commit 383775a

Please sign in to comment.