diff options
| -rw-r--r-- | bootstrap-vcpkg.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh index 7196fbde0..92e65dc6c 100644 --- a/bootstrap-vcpkg.sh +++ b/bootstrap-vcpkg.sh @@ -1,8 +1,4 @@ -<<<<<<< Updated upstream -#!/usr/bin/env bash -======= #!/bin/sh ->>>>>>> Stashed changes vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) $vcpkgRootDir/scripts/bootstrap.sh |