Resolve merge conflict
Showing
- .editorconfig 28 additions, 0 deletions.editorconfig
- .gitignore 2 additions, 1 deletion.gitignore
- doc.zih.tu-dresden.de/README.md 2 additions, 4 deletionsdoc.zih.tu-dresden.de/README.md
- doc.zih.tu-dresden.de/docs/accessibility.md 42 additions, 0 deletionsdoc.zih.tu-dresden.de/docs/accessibility.md
- doc.zih.tu-dresden.de/docs/archive/debugging_tools.md 0 additions, 14 deletionsdoc.zih.tu-dresden.de/docs/archive/debugging_tools.md
- doc.zih.tu-dresden.de/docs/archive/load_leveler.md 149 additions, 137 deletionsdoc.zih.tu-dresden.de/docs/archive/load_leveler.md
- doc.zih.tu-dresden.de/docs/data_protection_declaration.md 15 additions, 0 deletionsdoc.zih.tu-dresden.de/docs/data_protection_declaration.md
- doc.zih.tu-dresden.de/docs/index.md 1 addition, 2 deletionsdoc.zih.tu-dresden.de/docs/index.md
- doc.zih.tu-dresden.de/docs/legal_notice.md 24 additions, 0 deletionsdoc.zih.tu-dresden.de/docs/legal_notice.md
- doc.zih.tu-dresden.de/docs/software/debuggers.md 77 additions, 76 deletionsdoc.zih.tu-dresden.de/docs/software/debuggers.md
- doc.zih.tu-dresden.de/docs/software/software_development_overview.md 1 addition, 3 deletions...dresden.de/docs/software/software_development_overview.md
- doc.zih.tu-dresden.de/mkdocs.yml 9 additions, 7 deletionsdoc.zih.tu-dresden.de/mkdocs.yml
- doc.zih.tu-dresden.de/util/check-spelling-changes.sh 30 additions, 23 deletionsdoc.zih.tu-dresden.de/util/check-spelling-changes.sh
- doc.zih.tu-dresden.de/util/grep-forbidden-words.sh 97 additions, 47 deletionsdoc.zih.tu-dresden.de/util/grep-forbidden-words.sh
- doc.zih.tu-dresden.de/wordlist.aspell 3 additions, 0 deletionsdoc.zih.tu-dresden.de/wordlist.aspell
Loading
Please register or sign in to comment