From d020e424316e06407ef01dfabf5f2c6a1aa8089e Mon Sep 17 00:00:00 2001
From: fmcneill49 <142821158+fmcneill49@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:53:26 +0000
Subject: [PATCH] Update artis-kelvin2.sh

---
 scripts/artis-kelvin2.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/artis-kelvin2.sh b/scripts/artis-kelvin2.sh
index 7f4c878f1..940367d7a 100644
--- a/scripts/artis-kelvin2.sh
+++ b/scripts/artis-kelvin2.sh
@@ -1,15 +1,12 @@
 #!/bin/bash -x
-<<<<<<< HEAD
 #SBATCH --ntasks=1024
 #SBATCH --ntasks-per-node=128
 #SBATCH --time=24:00:00
 #SBATCH --partition=k2-math-physics
-=======
 #SBATCH --ntasks=128
 #SBATCH --ntasks-per-node=128
 #SBATCH --time=00:30:00
 #SBATCH --partition=k2-math-physics-debug
->>>>>>> d2ba9af0c61e5a64f38d1b84b74df9573c1910b8
 #SBATCH --mail-type=ALL
 ##SBATCH --mail-user=fmcneill07@qub.ac.uk