Allow functions and ambient classes to merge#32584

weswigham merged 2 commits intomicrosoft:mastermicrosoft/TypeScript:masterfrom

weswigham:allow-ambient-classes-and-functions-to-mergeweswigham/TypeScript:allow-ambient-classes-and-functions-to-mergeCopy head branch name to clipboard