resolve: fix README.md merge conflict
Some checks failed
Syntax / Linting and Type Checking (push) Has been cancelled
Tests / Linux Python 3.11 (push) Has been cancelled
Tests / Linux Python 3.12 (push) Has been cancelled
Tests / Linux Python 3.13 (push) Has been cancelled
Tests / Linux Python 3.14 (push) Has been cancelled
Tests / Linux Python 3.15 (push) Has been cancelled
Tests / MacOS Python 3.14 (push) Has been cancelled
Tests / Windows Python 3.14 (push) Has been cancelled
Tests / PR Coverage Report (push) Has been cancelled
Tests / Action Coverage Report (push) Has been cancelled
Tests / Ubuntu 24.04 & Sys Packages (push) Has been cancelled
Tests / Fedora 44 & Sys Packages (push) Has been cancelled

This commit is contained in:
B.D. Murphy
2026-11-06 08:29:14 -08:00

View File

@@ -10,7 +10,6 @@ The project format is well suited both for version control software and file syn
UmbraEdit is based on novelWrite 2026.02 by Veronica Berglyd Olsen (novelWriter.io) and is UmbraEdit is based on novelWrite 2026.02 by Veronica Berglyd Olsen (novelWriter.io) and is
licensed under the same GPL v3.0 license. licensed under the same GPL v3.0 license.
UmbraEdit is based on novelWrite 2026.02 by Veronica Berglyd Olsen (novelWriter.io) and is licensed under the same GPL v3.0 license.
B.D. Murphy is modifying the original using AI to make it part of his Umbratools publishing system. B.D. Murphy is modifying the original using AI to make it part of his Umbratools publishing system.
@@ -30,6 +29,8 @@ This project is a fork of novelWrite. Taking the great start and extending it. I
* Website: [UmbraEdit](https://umbratools.com/umbraedit) * Website: [UmbraEdit](https://umbratools.com/umbraedit)
* Documentation: [UmbraEdit Docs](https://umbratools.com/umbraedit/docs) * Documentation: [UmbraEdit Docs](https://umbratools.com/umbraedit/docs)
This project is a fork of novelWrite. Taking the great start and extending it. I use AI to help._
## Implementation ## Implementation
UmbraEdit is written in Python and uses Qt6 with PyQt6 Python binding as the UI framework. It UmbraEdit is written in Python and uses Qt6 with PyQt6 Python binding as the UI framework. It
@@ -51,22 +52,18 @@ good reason for doing so. Please do not submit AI generated content.
See our [AI Policy](https://github.com/saga-soft/UmbraEdit/blob/main/AI_POLICY.md) for details. See our [AI Policy](https://github.com/saga-soft/UmbraEdit/blob/main/AI_POLICY.md) for details.
Fixes and patches are welcome. Contributions related to packaging and installing UmbraEdit will Fixes and patches are welcome. Contributions related to packaging and installing UmbraEdit will
also be appreciated, but please make an issue or a discussion topic first. Before contributing any also be appreciated. Before contributing any code, please read the full
code, please read the full
[Contributing Guide](https://github.com/saga-soft/UmbraEdit/blob/main/CONTRIBUTING.md). [Contributing Guide](https://github.com/saga-soft/UmbraEdit/blob/main/CONTRIBUTING.md).
Project credits are available in [CREDITS.md](https://github.com/saga-soft/UmbraEdit/blob/main/CREDITS.md). ## Original Credits
Project credits are available in [CREDITS.md](https://github.com/saga-soft/novelwriter/blob/main/CREDITS.md).
**Note:** New features and most pre-releases are made on the `main` branch. Full releases are made **Note:** New features and most pre-releases are made on the `main` branch. Full releases are made
from the `release` branch. So if you're submitting a fix to a current release, **including changes from the `release` branch. So if you're submitting a fix to a current release, **including changes
to documentation**, they must be made to the `release` branch. to documentation**, they must be made to the `release` branch.
### Translations
## Licence ## Licence
This is Open Source software, and UmbraEdit is licensed under GPLv3. See the This is Open Source software, and UmbraEdit is licensed under GPLv3. See the