From 03b13140e04de028b4ebe665bf216d9f867e20a7 Mon Sep 17 00:00:00 2001
From: MLErik <baerenjesus@gmail.com>
Date: Thu, 26 Sep 2019 15:57:19 -0400
Subject: [PATCH] minor conflict
---
examples/simple_example_city_railway_generator.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/examples/simple_example_city_railway_generator.py b/examples/simple_example_city_railway_generator.py
index f44ad84f..0132d8bd 100644
--- a/examples/simple_example_city_railway_generator.py
+++ b/examples/simple_example_city_railway_generator.py
@@ -52,7 +52,10 @@ for itrials in np.arange(1, 15, 1):
# store rendered file into render_output if the path exists
env_renderer.gl.save_image(
os.path.join(
+<<<<<<< 188_refining_generator
"./../render_output/",
+=======
+>>>>>>> local
"flatland_frame_{:04d}.png".format(itrials)
))
--
GitLab