From 49768bb51e7f5014ac117ca75e313b2cf8fcbd7f Mon Sep 17 00:00:00 2001
From: stadtler1 <s.stadtler@fz-juelich.de>
Date: Thu, 3 Sep 2020 10:49:30 +0200
Subject: [PATCH] Changed the name of the error and output logs.

---
 video_prediction_savp/HPC_scripts/train_movingmnist.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/video_prediction_savp/HPC_scripts/train_movingmnist.sh b/video_prediction_savp/HPC_scripts/train_movingmnist.sh
index 6555bb12..e750482c 100755
--- a/video_prediction_savp/HPC_scripts/train_movingmnist.sh
+++ b/video_prediction_savp/HPC_scripts/train_movingmnist.sh
@@ -4,13 +4,8 @@
 #SBATCH --ntasks=1
 ##SBATCH --ntasks-per-node=1
 #SBATCH --cpus-per-task=1
-<<<<<<< Updated upstream
 #SBATCH --output=train_moving_mnist-out.%j
 #SBATCH --error=train_moving_mnist-err.%j
-=======
-#SBATCH --output=train_era5-out.%j
-#SBATCH --error=train_era5-err.%j
->>>>>>> Stashed changes
 #SBATCH --time=00:20:00
 #SBATCH --gres=gpu:1
 #SBATCH --partition=develgpus
-- 
GitLab