fix: rebased upon master

psykei · Jan 22, 2023 · bd0018e · bd0018e
2 parents 67a79cd + 3b2edfa
commit bd0018e
Show file tree

Hide file tree

Showing 4 changed files with 2,834 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,11 +9,7 @@ ENV JUPYTER_CONF_FILE /root/.jupyter/jupyter_notebook_config.py
 RUN echo "c.NotebookApp.allow_origin = '*'" > $JUPYTER_CONF_FILE
 RUN echo "c.NotebookApp.ip = '0.0.0.0'" >> $JUPYTER_CONF_FILE
 RUN mkdir -p /notebook
-<<<<<<< HEAD
 COPY demo/*.ipynb /notebook/
 COPY test/resources/datasets/*.csv /notebook/datasets/
-=======
-COPY demo/DemoClassificationDisc.ipynb /notebook
->>>>>>> chore: move demos into demo/ directory
 WORKDIR /notebook
-CMD jupyter notebook --allow-root --no-browser
+CMD jupyter notebook --allow-root --no-browser