Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it. |
||
|---|---|---|
| .. | ||
| actions | ||
| ISSUE_TEMPLATE | ||
| workflows | ||
| codecov.yml | ||
| renovate.json5 | ||
| stale.yml | ||
| stylelint-matcher.json | ||
Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it. |
||
|---|---|---|
| .. | ||
| actions | ||
| ISSUE_TEMPLATE | ||
| workflows | ||
| codecov.yml | ||
| renovate.json5 | ||
| stale.yml | ||
| stylelint-matcher.json | ||