Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[sh] Remove merge conflict lines

This commit is contained in:
Alexander Karatarakis 2018-04-25 14:36:31 -07:00
parent 90be0d9b67
commit d1b9a8637c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap-vcpkg.sh
View File

@ -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