Skip to content
Snippets Groups Projects
Commit f3ef5bec authored by Luigi's avatar Luigi
Browse files

Merge master

parents cbe00837 1a7f3df8
Branches
No related tags found
2 merge requests!123testing develop merge,!23Various tutorials
...@@ -108,10 +108,13 @@ RUN pip install ./analytics-kaggle-competition ...@@ -108,10 +108,13 @@ RUN pip install ./analytics-kaggle-competition
RUN pip install ./analytics-soap-atomic-charges RUN pip install ./analytics-soap-atomic-charges
RUN pip install ./analytics-tcmi RUN pip install ./analytics-tcmi
RUN pip install -r ./analytics-query-nomad-repository/requirements.txt RUN pip install -r ./analytics-query-nomad-repository/requirements.txt
<<<<<<< HEAD
RUN pip install ./analytics-descriptor-role RUN pip install ./analytics-descriptor-role
RUN pip install ./analytics-decision-tree RUN pip install ./analytics-decision-tree
RUN pip install ./analytics-nn-regression RUN pip install ./analytics-nn-regression
RUN pip install ./analytics-perovskites-tolerance-factor RUN pip install ./analytics-perovskites-tolerance-factor
=======
>>>>>>> master
USER root USER root
... ...
......
Subproject commit c969faae0dea1e3e6490cd9ebc02f1696e40be61 Subproject commit 92df957da8cea44beb5d823bcd064980c215d6e6
Subproject commit 792b0d4779b3a2182340421d56c61bb5e7934d12 Subproject commit 41da4bc9c67786937b597cc8158d3d566dd34282
Subproject commit f2c9e69a8de37f27a5f08f4d7d098606026c75dc Subproject commit cb7dd646000955e289df871ec44abf6a0826301b
Subproject commit 01c94c55477b4b84f3cf8b2e8d1dc73ce1e6abea Subproject commit d0a0b35a5386b4cf474426b2d26ea7b0d0fd2f7f
Subproject commit bd59de7cd20de0cf331620926fefb5e79d65c859 Subproject commit 2711861c6e4c31b3665995ea9f3616843992c022
Subproject commit 3283f4bda23a89f054e9e5ffc0e23137e0fe4d74 Subproject commit b3f0de719405d78b49554e1ac99857f2d6ec9b82
Subproject commit 13fd5e6faa39fc359b86294805de4c451f645d47 Subproject commit 7644b6372452bcbd0c53508179aacd572e1cb12d
Subproject commit 58bd31fe94aed52cae3386853955e5ea382aeb81 Subproject commit 292d7a1fa24c5a0e70b2d33a2dc759ecb0d57123
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment