From d1b9a8637c84d185dd2c99249bae41864987bf05 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 25 Apr 2018 14:36:31 -0700
Subject: [sh] Remove merge conflict lines

---
 bootstrap-vcpkg.sh | 4 ----
 1 file changed, 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
-- 
cgit v1.2.3