Update artis-kelvin2.sh

artis-mcrt · Jan 19, 2025 · cd31684 · cd31684
1 parent 26ab507
commit cd31684
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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