From 929614e07902032493c58a210a01b17e958bd02b Mon Sep 17 00:00:00 2001
From: Bing Gong <b.gong@fz-juelich.de>
Date: Wed, 18 Jan 2023 14:09:11 +0100
Subject: [PATCH] Update
 video_prediction_tools/main_scripts/main_train_models.py

---
 video_prediction_tools/main_scripts/main_train_models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/video_prediction_tools/main_scripts/main_train_models.py b/video_prediction_tools/main_scripts/main_train_models.py
index a9364277..7dad59d4 100644
--- a/video_prediction_tools/main_scripts/main_train_models.py
+++ b/video_prediction_tools/main_scripts/main_train_models.py
@@ -418,7 +418,6 @@ class TrainModel(object):
         if self.video_model.__class__.__name__ == "VanillaConvLstmVideoPredictionModel":
             fetch_list = fetch_list + ["inputs"]
             self.saver_loss = fetch_list[-1]
-<<<<<<< HEAD
             self.saver_loss_name = "Total loss"
         if self.video_model.__class__.__name__ == "WeatherBenchModel":
             fetch_list = fetch_list + ["total_loss"]
-- 
GitLab