Merge branch 'develop' into feature/entryFields

# Conflicts:
#	VDSSample/ViewControllers/MenuViewController.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-10-10 16:42:37 -05:00
commit fe11e92b46

View File

@ -377,7 +377,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\n\ncd ../\nsh update.sh\n";
shellScript = "#!/bin/bash\n\nsh update.sh\n";
};
EAF7F0D2289DA44700B287F5 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;