Remove merge conflict marker

This commit is contained in:
Andy Hanson
2016-12-29 15:05:26 -08:00
parent 800f464c83
commit 79a6cdfefd

View File

@@ -96,7 +96,6 @@
"asOfVersion": "2.0.18"
},
{
<<<<<<< HEAD
"libraryName": "camel-case",
"typingsPackageName": "camel-case",
"sourceRepoURL": "https://github.com/blakeembrey/camel-case",