mirror of
https://github.com/QubesOS/qubes-doc.git
synced 2025-11-13 08:40:44 -05:00
Resolved conflicts in:
basics_user/doc-guidelines.md
basics_user/reporting-bugs.md
common-tasks/backup-restore.md
common-tasks/software-update-dom0.md
common-tasks/software-update-vm.md
common-tasks/usb.md
configuration/disk-trim.md
configuration/external-audio.md
configuration/network-printer.md
configuration/resize-disk-image.md
configuration/resize-root-disk-image.md
customization/fedora-minimal-template-customization.md
managing-os/hvm.md
managing-os/templates/archlinux.md
privacy/whonix-install.md
security/yubi-key.md
troubleshooting/install-nvidia-driver.md
troubleshooting/macbook-troubleshooting.md
|
||
|---|---|---|
| .. | ||
| architecture.md | ||
| gui.md | ||
| networking.md | ||
| security-critical-code.md | ||
| storage-pools.md | ||
| template-implementation.md | ||