Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept ours. - `yarn.lock`: Upstream changed from yarn 1 to yarn 4, but we had some different dependencies. Updated to yarn 4 and re-added our dependencies. |
||
|---|---|---|
| .. | ||
| actions | ||
| ISSUE_TEMPLATE | ||
| workflows | ||
| renovate.json5 | ||
| stale.yml | ||
| stylelint-matcher.json | ||