diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh old mode 100755 new mode 100644 index 4bfb17308f..7196fbde0f --- a/bootstrap-vcpkg.sh +++ b/bootstrap-vcpkg.sh @@ -1,2 +1,8 @@ +<<<<<<< Updated upstream +#!/usr/bin/env bash +======= +#!/bin/sh +>>>>>>> Stashed changes + vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) -$vcpkgRootDir/scripts/bootstrap.sh \ No newline at end of file +$vcpkgRootDir/scripts/bootstrap.sh