Files
swift-mirror/include/swift/Basic
Nate Chandler c43f87101f Merge branch 'main' into rebranch
Conflicts:
      lib/Basic/Platform.cpp

```
diff --git a/lib/Basic/Platform.cpp b/lib/Basic/Platform.cpp
index 240edfa144a..1797c87635f 100644
--- a/lib/Basic/Platform.cpp
+++ b/lib/Basic/Platform.cpp
@@ -200,10 +200,7 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   case llvm::Triple::CUDA:
   case llvm::Triple::DragonFly:
   case llvm::Triple::DriverKit:
-<<<<<<< HEAD
   case llvm::Triple::ELFIAMCU:
-=======
->>>>>>> main
   case llvm::Triple::Emscripten:
   case llvm::Triple::Fuchsia:
   case llvm::Triple::HermitCore:
```
2024-04-17 13:32:48 -07:00
..
2023-07-13 11:22:35 -07:00
2023-11-08 14:56:20 -08:00
2024-02-21 11:20:06 -08:00
2023-07-25 12:28:27 -07:00
2023-07-25 12:28:27 -07:00
2024-04-10 09:38:02 -07:00
2024-02-21 11:20:06 -08:00