Fix merge conflict
Description
Description
Details
Details
- Provenance
lynorian Authored on Oct 20 2022, 7:56 AM lynorian Pushed on Oct 20 2022, 7:56 AM - Parents
- rMANUAL616758c8a23c: Add workaround for Libreoffice translation bug link thanks Arraybolt3
rMANUAL69a08e9eac6c: Fix typo in lxqt-runner and merge conflict from the typo - Branches
- Unknown
- Tags
- Unknown
- References
- lts
Event Timeline
lynorian committed rMANUALe9294334834e: Fix merge conflict (authored by lynorian).Oct 20 2022, 7:56 AM2022-10-20 07:56:17 (UTC+0)
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 6c345b571d44 Make zsync link for jammyAuthor
- d298536427c8 Fix warning in muonAuthor
- a076467f62ea Add choices for removing packagesAuthor
- dc00449e9bc3 Fix appendix C capitlizationAuthor
- a0982da2adf2 Spellcheck upgradingAuthor
- 698e7902ec7e Add note on promptingAuthor
- 52525a11710b Add y to continue upgradeAuthor
- a546ef168be9 Add press d for detailsAuthor
- deea6ce86c0d Add quit libreofficeAuthor
- 79bb98c09d11 Add menu way for recent documentsAuthor
- a200f4758887 Add clear a particular fileAuthor
- 1bb2fece36af Add subcategory of templatesAuthor
- 32d0e0eb74e4 Reword torrent finishing sentenceAuthor
- 721687e1462f remove extra colonAuthor
- 8c5d7c28da5c finish rebooting sectionAuthor
- 205e402bb989 Add done button for rebootingAuthor
- 7d2b17842237 Fix encrypt checkbox wordingAuthor
- 64ed10f1860a Move keyboard layout testing downAuthor
- 6a38179f5c3b Update live session.pngAuthor
- 3c8760fd6c13 Update grubsplash screenshotAuthor
- d1f325e76a51 Add right click show toolbarAuthor
- 2b36b69e94f6 Add unmark packageAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.