chore: Test squash (#914)

* chore: Update 1 * chore: Update 2 (cherry picked from commit 1a00d0f) # Conflicts: # Readme.md
unoplatform · Nov 2, 2024 · c546e40 · c546e40
1 parent fcf599c
commit c546e40
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Readme.md b/Readme.md
@@ -37,3 +37,9 @@ This package is based on the excellent work from @praeclarum's [OOui Wasm MSBuil
   - [PWA Support](doc/features-pwa.md)
   - [4GB Support](doc/features-4gb.md)
 - [Contributing](doc/contributing.md)
+<<<<<<< HEAD
+=======
+- [Release procedure](doc/release-procedure.md)
+
+
+>>>>>>> 1a00d0f (chore: Test squash (#914))