vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-10-04 14:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13623 from DefinitelyTyped/not_needed_fix

Browse Source 
Remove merge conflict marker
This commit is contained in:
Andy
2016-12-29 15:06:22 -08:00
committed by GitHub
parent 800f464c83 79a6cdfefd
commit 435aa0f13e
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
notNeededPackages.json
-1
View File
@@ -96,7 +96,6 @@
"asOfVersion": "2.0.18"
},
{
<<<<<<< HEAD
"libraryName": "camel-case",
"typingsPackageName": "camel-case",
"sourceRepoURL": "https://github.com/blakeembrey/camel-case",