Revert some files

Author: jzc

clang/include/clang/Basic/Cuda.h

@@ -9,11 +9,7 @@
 #ifndef LLVM_CLANG_BASIC_CUDA_H
 #define LLVM_CLANG_BASIC_CUDA_H
 
-<<<<<<< HEAD
-#include "clang/Basic/Offloading.h"
-=======
 #include "clang/Basic/OffloadArch.h"
->>>>>>> llvm/main
 
 namespace llvm {
 class StringRef;

clang/include/clang/Basic/Offloading.h

@@ -76,11 +76,7 @@ add_clang_library(clangBasic
   MakeSupport.cpp
   Module.cpp
   ObjCRuntime.cpp
-<<<<<<< HEAD
-  Offloading.cpp
-=======
   OffloadArch.cpp
->>>>>>> llvm/main
   OpenCLOptions.cpp
   OpenMPKinds.cpp
   OperatorPrecedence.cpp