From abf246e891049194f96dccbc393a78d5235f805d Mon Sep 17 00:00:00 2001
From: Michael <m.langguth@fz-juelich.de>
Date: Fri, 12 Feb 2021 17:30:53 +0100
Subject: [PATCH] Adapt gitignore for renamed nonHPC-scripts.

---
 .gitignore | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 004d99ce..aae82f1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,9 +124,8 @@ virt_env*/
 # Ignore (Batch) runscripts
 video_prediction_tools/HPC_scripts/**
 !video_prediction_tools/HPC_scripts/*_template.sh
-video_prediction_tools/Zam347_scripts/**
-!video_prediction_tools/Zam347_scripts/*_template.sh
-<<<<<<< HEAD
+video_prediction_tools/nonHPC_scripts/**
+!video_prediction_tools/nonHPC_scripts/*_template.sh
 
 # Ignore datasplit config files
 video_prediction_tools/data_split/**
-- 
GitLab