mirror of
https://github.com/QubesOS/qubes-doc.git
synced 2024-10-01 01:25:40 -04:00
919f2ed17e
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 |
||
---|---|---|
.. | ||
install-nvidia-driver.md | ||
intel-igfx-troubleshooting.md | ||
macbook-troubleshooting.md | ||
nvidia-troubleshooting.md | ||
out-of-memory.md | ||
remove-vm-manually.md | ||
sony-vaio-tinkering.md | ||
thinkpad-troubleshooting.md | ||
uefi-troubleshooting.md | ||
updating-debian-and-whonix.md | ||
wireless-troubleshooting.md |