From 08a30dbbc1cbaeacb6140a4bf27a27b1bc712763 Mon Sep 17 00:00:00 2001
From: Dipam Chakraborty <dipam@aicrowd.com>
Date: Tue, 14 Sep 2021 18:16:45 +0530
Subject: [PATCH] merge import fix
---
flatland/envs/rail_env.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/flatland/envs/rail_env.py b/flatland/envs/rail_env.py
index 9854e722..a56ea043 100644
--- a/flatland/envs/rail_env.py
+++ b/flatland/envs/rail_env.py
@@ -5,14 +5,11 @@ import random
from typing import List, Optional, Dict, Tuple
-<<<<<<< HEAD
-from flatland.utils.rendertools import RenderTool, AgentRenderVariant
-=======
import numpy as np
from gym.utils import seeding
from dataclasses import dataclass
->>>>>>> env-step-facelift
+from flatland.utils.rendertools import RenderTool, AgentRenderVariant
from flatland.core.env import Environment
from flatland.core.env_observation_builder import ObservationBuilder
from flatland.core.grid.grid4 import Grid4Transitions
@@ -752,7 +749,7 @@ class RailEnv(Environment):
print("Could Not close window due to:",e)
self.renderer = None
-
+
@dataclass(repr=True)
class AgentTransitionData:
""" Class for keeping track of temporary agent data for position update """
--
GitLab