From c406f42baf61651f59e4b6b7ec3a27d2b1e645d2 Mon Sep 17 00:00:00 2001
From: Xavier Dupre <xadupre@microsoft.com>
Date: Wed, 12 Jun 2024 10:31:37 +0200
Subject: [PATCH] fix merge conflicts

---
 operators/cuda/cuda_ops.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/operators/cuda/cuda_ops.cc b/operators/cuda/cuda_ops.cc
index b42b65527..470d18153 100644
--- a/operators/cuda/cuda_ops.cc
+++ b/operators/cuda/cuda_ops.cc
@@ -8,11 +8,8 @@
 #include "cuda/fast_gelu.h"
 #include "cuda/mul_sigmoid.h"
 #include "cuda/negxplus1.h"
-<<<<<<< HEAD
 #include "cuda/rotary.h"
-=======
 #include "cuda/scatter_nd_of_shape.h"
->>>>>>> f5055466d5376059c2ea74e3cea46e16a537bc0d
 #include "cuda/transpose_cast.h"
 #endif