Skip to content
Snippets Groups Projects
Commit e76bd582 authored by Vasco Wild's avatar Vasco Wild
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	README.md
parents 64f5d258 ee3dbe3e
No related branches found
No related tags found
No related merge requests found
......@@ -14,11 +14,7 @@ The following is simply a brief overview of the features contained in this repo.
### Tooling
<<<<<<< HEAD
- accompanying [institute's Docker image](https://collaborating.tuhh.de/m21/public/theses/latex_dockerfile), usable locally and in CI/CD, guaranteeing compilation success without interfering with your local installation.
=======
- accompanying [Docker image](https://collaborating.tuhh.de/m21/public/theses/latex_dockerfile), usable locally and in CI/CD, guaranteeing compilation success without interfering with your local installation.
>>>>>>> upstream/master
In fact, using Docker (containerization in general), no LaTeX installation is required at all.
- accompanying Visual Studio Code [environment configuration](.devcontainer/devcontainer.json).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment