search

swiftlang / sourcekit-lsp

Language Server Protocol implementation for Swift and C-based languages
Apache License 2.0
3.33k stars 280 forks source link

Fix merge conflict #1838

Closed ahoppen closed 1 week ago

ahoppen commented 1 week ago

https://github.com/swiftlang/sourcekit-lsp/pull/1824 and https://github.com/swiftlang/sourcekit-lsp/pull/1832 raced.

rjmccall commented 1 week ago

Force-merged to unblock CI