Fix mistakes in merging patches

GOMC-WSU · Dec 7, 2024 · 86d0dc3 · 86d0dc3
1 parent 3773dd5
commit 86d0dc3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/src/GPU/CalculateMinImageCUDAKernel.cuh b/src/GPU/CalculateMinImageCUDAKernel.cuh
@@ -5,16 +5,9 @@ A copy of the MIT License can be found in License.txt
 along with this program, also can be found at
 <https://opensource.org/licenses/MIT>.
 ********************************************************************************/
-<<<<<<< HEAD
-#ifndef CALCULATE_MINIMAGE_CUDA_KERNEL
-#define CALCULATE_MINIMAGE_CUDA_KERNEL
-=======
 #ifndef CALCULATE_MIN_IMAGE_CUDA_KERNEL_H
 #define CALCULATE_MIN_IMAGE_CUDA_KERNEL_H
 
-#ifdef GOMC_CUDA
->>>>>>> 713622a633285c25d8fa52a907e71d3b87157874
-
 #ifdef GOMC_CUDA
 #include "ConstantDefinitionsCUDAKernel.cuh"
 #include <cuda.h>
@@ -287,8 +280,4 @@ static __inline__ __device__ double atomicAdd(double *address, double val) {
 #endif /*CUDA_ARCH*/
 
 #endif /*GOMC_CUDA*/
-<<<<<<< HEAD
-#endif /*CALCULATE_MINIMAGE_CUDA_KERNEL*/
-=======
 #endif /*CALCULATE_MIN_IMAGE_CUDA_KERNEL_H*/
->>>>>>> 713622a633285c25d8fa52a907e71d3b87157874
diff --git a/src/GPU/TransformParticlesCUDAKernel.cuh b/src/GPU/TransformParticlesCUDAKernel.cuh
@@ -94,6 +94,5 @@ __global__ void BrownianMotionTranslateKernel(
     double3 axis, double3 halfAx, int atomCount, double t_max, ulong step,
     unsigned int key, ulong seed, double BETA);
 
-<<<<<<< HEAD
 #endif /*GOMC_CUDA*/
 #endif /*TRANSFORM_PARTICLES_CUDA_KERNEL_H*/