Instead of resolving conflict, get rid of conflict

KaffinPX · Jan 19, 2025 · 9c2dfd7 · 9c2dfd7
1 parent eff3676
commit 9c2dfd7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 56 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json