From b9f6fb97f2ebfe6f1800684cd573e034e9959b59 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Wed, 8 Aug 2018 09:29:09 -0700
Subject: [PATCH] fix merge conflict

---
 clients/ts/package-lock.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/clients/ts/package-lock.json b/clients/ts/package-lock.json
index a6aa5ea493..0a2c01265d 100644
--- a/clients/ts/package-lock.json
+++ b/clients/ts/package-lock.json
@@ -1,9 +1,6 @@
 {
   "name": "client-ts",
   "version": "0.0.0",
-<<<<<<< HEAD
-  "lockfileVersion": 1
-=======
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8952,5 +8949,4 @@
       }
     }
   }
->>>>>>> release/2.1
 }