Post-merge fix

Author: Meinersbur

flang-rt/include/flang-rt/CUDA/allocator.h

@@ -9,7 +9,7 @@
 #ifndef FLANG_RT_CUDA_ALLOCATOR_H_
 #define FLANG_RT_CUDA_ALLOCATOR_H_
 
-#include "common.h"
+#include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/descriptor-consts.h"
 #include "flang/Runtime/entry-names.h"
 

flang-rt/lib/CufRuntime/descriptor.cpp

@@ -11,7 +11,6 @@
 #include "flang-rt/descriptor.h"
 #include "../flang_rt/terminator.h"
 #include "flang/Runtime/CUDA/common.h"
-#include "flang/Runtime/descriptor.h"
 
 #include "cuda_runtime.h"