From 79a6cdfefd0a4c7824e33bd4cc4dbcce1d478698 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 29 Dec 2016 15:05:26 -0800
Subject: [PATCH] Remove merge conflict marker

---
 notNeededPackages.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 6f0bcd5cdb..6ec3f8a6b8 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -96,7 +96,6 @@
             "asOfVersion": "2.0.18"
         },
         {
-<<<<<<< HEAD
             "libraryName": "camel-case",
             "typingsPackageName": "camel-case",
             "sourceRepoURL": "https://github.com/blakeembrey/camel-case",