aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]bootstrap-vcpkg.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh
index 67102ca25..7196fbde0 100755..100644
--- a/bootstrap-vcpkg.sh
+++ b/bootstrap-vcpkg.sh
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
#!/usr/bin/env bash
+=======
+#!/bin/sh
+>>>>>>> Stashed changes
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
$vcpkgRootDir/scripts/bootstrap.sh