[sh] Remove merge conflict lines

killvxk · Apr 25, 2018 · d1b9a86 · d1b9a86
1 parent 90be0d9
commit d1b9a86
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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