Modify Dockerfile to resolve merge conflict
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Dockerfile 9 additions, 1 deletionDockerfile
- doc.zih.tu-dresden.de/docs/contrib/content_rules.md 7 additions, 6 deletionsdoc.zih.tu-dresden.de/docs/contrib/content_rules.md
- doc.zih.tu-dresden.de/docs/contrib/contribute_container.md 9 additions, 6 deletionsdoc.zih.tu-dresden.de/docs/contrib/contribute_container.md
- doc.zih.tu-dresden.de/docs/jobs_and_resources/slurm.md 27 additions, 5 deletionsdoc.zih.tu-dresden.de/docs/jobs_and_resources/slurm.md
- doc.zih.tu-dresden.de/docs/jobs_and_resources/slurm_examples.md 17 additions, 17 deletions...h.tu-dresden.de/docs/jobs_and_resources/slurm_examples.md
- doc.zih.tu-dresden.de/docs/software/data_analytics_with_r.md 2 additions, 2 deletionsdoc.zih.tu-dresden.de/docs/software/data_analytics_with_r.md
- doc.zih.tu-dresden.de/docs/software/distributed_training.md 2 additions, 2 deletionsdoc.zih.tu-dresden.de/docs/software/distributed_training.md
- doc.zih.tu-dresden.de/docs/software/fem_software.md 5 additions, 5 deletionsdoc.zih.tu-dresden.de/docs/software/fem_software.md
- doc.zih.tu-dresden.de/docs/software/nanoscale_simulations.md 2 additions, 2 deletionsdoc.zih.tu-dresden.de/docs/software/nanoscale_simulations.md
- doc.zih.tu-dresden.de/docs/software/python_virtual_environments.md 1 addition, 1 deletion...u-dresden.de/docs/software/python_virtual_environments.md
- doc.zih.tu-dresden.de/docs/software/visualization.md 16 additions, 15 deletionsdoc.zih.tu-dresden.de/docs/software/visualization.md
- doc.zih.tu-dresden.de/mkdocs.yml 6 additions, 2 deletionsdoc.zih.tu-dresden.de/mkdocs.yml
- doc.zih.tu-dresden.de/util/download-newest-mermaid.js.sh 9 additions, 0 deletionsdoc.zih.tu-dresden.de/util/download-newest-mermaid.js.sh
- doc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh 28 additions, 11 deletionsdoc.zih.tu-dresden.de/util/grep-forbidden-patterns.sh
Loading
Please register or sign in to comment