From 3ab720b8bebbdf7b23a53f320d6286fbe0d3d5a1 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Tue, 29 Aug 2017 13:44:55 -0700
Subject: [PATCH] fixed travis.yml

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b52af53c..3f59d61c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,6 @@ env:
   - TEST_PHP_SQL_UID=sa
   - TEST_PHP_SQL_PWD=Password12@
 
->>>>>>> 22838b1... added KSP related code and scripts to enable testing KSP
-
 before_install:
   - docker pull microsoft/mssql-server-linux