Merge pull request #129 from shankari/fix_start_notebook_path

Bump up versions
e-mission · Apr 15, 2024 · 3b30af0 · 3b30af0
2 parents c1639de + 2327bf2
commit 3b30af0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/viz_scripts/Dockerfile b/viz_scripts/Dockerfile
@@ -1,5 +1,9 @@
 # python 3
+<<<<<<< Updated upstream
 FROM shankari/e-mission-server:master_2024-04-08--17-44
+=======
+FROM shankari/e-mission-server:master_2024-04-15--53-23
+>>>>>>> Stashed changes
 
 VOLUME /plots
 

diff --git a/viz_scripts/docker/Dockerfile.dev b/viz_scripts/docker/Dockerfile.dev
@@ -1,5 +1,9 @@
 # python 3
+<<<<<<< Updated upstream
 FROM shankari/e-mission-server:master_2024-04-08--17-44
+=======
+FROM shankari/e-mission-server:master_2024-04-15--53-23
+>>>>>>> Stashed changes
 
 VOLUME /plots