Resolve merge conflicts

2026-02-23 13:43:02 +01:00
parent 6543166ffc 9030ba902c
commit 7ac4e68dc8
95 changed files with 6182 additions and 744 deletions
@@ -16,15 +16,12 @@ wip:

 For anything in the packages/web use the docs: prefix.

-For anything in the packages/app use the ignore: prefix.
-
 prefer to explain WHY something was done from an end user perspective instead of
 WHAT was done.

 do not do generic messages like "improved agent experience" be very specific
 about what user facing changes were made

-if there are changes do a git pull --rebase
 if there are conflicts DO NOT FIX THEM. notify me and I will fix them

 ## GIT DIFF