Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||
Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||