# Conflicts: # VDSSample/ViewControllers/MenuViewController.swift Signed-off-by: Matt Bruce <matt.bruce@verizon.com> |
||
|---|---|---|
| .. | ||
| project.xcworkspace | ||
| xcshareddata/xcschemes | ||
| project.pbxproj | ||
# Conflicts: # VDSSample/ViewControllers/MenuViewController.swift Signed-off-by: Matt Bruce <matt.bruce@verizon.com> |
||
|---|---|---|
| .. | ||
| project.xcworkspace | ||
| xcshareddata/xcschemes | ||
| project.pbxproj | ||