mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
Trivial conflict caused by the line above the `IGM.constructInitialFnAttributes` change in `lib/IRGen/GenDecl.cpp` having an extra argument passed in rebranch (due to the new LLVM API).
16 KiB
16 KiB