Closed aminya closed 2 years ago
:umbrella: The latest upstream changes (presumably #1771) made this pull request unmergeable. Please resolve the merge conflicts.
☔ The latest upstream changes (presumably #1771) made this pull request unmergeable. Please resolve the merge conflicts.
Fixed the conflicts
@Xanewok It seems your racer update on the master branch has broken the build.
:umbrella: The latest upstream changes (presumably #1775) made this pull request unmergeable. Please resolve the merge conflicts.
This also requires https://github.com/rust-lang/rls/pull/1769 for a successful ci build.