Conflicts: - `.prettierignore`: Upstream added a file, glitch-soc had extra files. Took upstream's changes and moved glitch-soc's additions at the end.
2.0 KiB
2.0 KiB
Conflicts: - `.prettierignore`: Upstream added a file, glitch-soc had extra files. Took upstream's changes and moved glitch-soc's additions at the end.