Skip to content

Fix semantic merge conflict#20119

Merged
weswigham merged 1 commit into
masterfrom
toArray
Nov 17, 2017
Merged

Fix semantic merge conflict#20119
weswigham merged 1 commit into
masterfrom
toArray

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Nov 17, 2017

Broke the build by adding the same function in different places in two different PRs.

@ghost ghost requested review from armanio123, sandersn and weswigham November 17, 2017 23:09
@weswigham weswigham merged commit 82502ea into master Nov 17, 2017
@weswigham weswigham deleted the toArray branch November 17, 2017 23:29
errendir added a commit to errendir/TypeScript that referenced this pull request Nov 20, 2017
* origin/master: (140 commits)
  test overriding Session.event
  Update editorServices.ts
  Fix semantic merge conflict (microsoft#20119)
  LEGO: check in for master to temporary branch.
  Moved minified file exclusion
  Fixed internal safelist
  For import completion, if multiple re-exports exist, choose the one with the shortest path (microsoft#20049)
  Bundle fileName with CodeActionCommand (microsoft#19881)
  Simplify documentHighlights (microsoft#20091)
  LEGO: check in for master to temporary branch.
  Support semantic classification of alias (microsoft#20012)
  In `getContextualTypeForBinaryOperand`, only need to look for `=` assignment operator, not e.g. `+=` (microsoft#20037)
  lineAction: Use an enum instead of true | false | undefined (microsoft#20086)
  LEGO: check in for master to temporary branch.
  cleanup NodeTypingsInstaller
  remove comments
  type `event` callback correctly
  update baselines
  defer callback and remove handler object
  Support arbitrary prototype property assignments in navigation bar (microsoft#19923)
  ...
@microsoft microsoft locked and limited conversation to collaborators Jun 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant