diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-04-25 14:36:31 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-04-25 14:36:31 -0700 |
| commit | d1b9a8637c84d185dd2c99249bae41864987bf05 (patch) | |
| tree | 7b8a4eca15456d07fdf379bdeac166b0215b7aad | |
| parent | 90be0d9b67cfe8d86f31a5303c98365291de17bb (diff) | |
| download | vcpkg-d1b9a8637c84d185dd2c99249bae41864987bf05.tar.gz vcpkg-d1b9a8637c84d185dd2c99249bae41864987bf05.zip | |
[sh] Remove merge conflict lines
| -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 |