From a5be925ae1bf52c00289b320559aab0bb52ef971 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 25 Nov 2016 08:28:20 -0500
Subject: [PATCH] Remove merge conflict marker (#12916)

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 7c049c86fa..564c94b3fe 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -70,7 +70,6 @@
             "typingsPackageName": "simplesignal",
             "sourceRepoURL": "https://github.com/zeh/simplesignal",
             "asOfVersion": "1.0.0"
->>>>>>> types-2.0
         }
     ]
 }