Conflicts: CHANGELOG.md LICENSE builds/4chan-X.meta.js builds/appchan-x.user.js builds/crx/manifest.json builds/crx/script.js latest.js package.json src/General/Header.coffee src/General/css/font-awesome.css src/Miscellaneous/CatalogLinks.coffee
Conflicts: CHANGELOG.md LICENSE builds/4chan-X.meta.js builds/appchan-x.user.js builds/crx/manifest.json builds/crx/script.js latest.js package.json src/General/Header.coffee src/General/css/font-awesome.css src/Miscellaneous/CatalogLinks.coffee