2c2a40c0c9
Conflicts: .gitignore CHANGELOG.md Gruntfile.coffee LICENSE builds/4chan-X.js builds/4chan-X.meta.js builds/4chan-X.user.js builds/crx/manifest.json builds/crx/script.js latest.js package.json src/General/Config.coffee
16 lines
202 B
Plaintext
16 lines
202 B
Plaintext
node_modules/
|
|
*~
|
|
*.db
|
|
tmp-crx/
|
|
tmp-userjs/
|
|
tmp-userscript/
|
|
<<<<<<< HEAD
|
|
builds/4chan-X.zip
|
|
Gruntfile.js
|
|
builds/4chan-*
|
|
=======
|
|
builds/4chan-X-Chrome.zip
|
|
builds/4chan-X-Opera.nex
|
|
Gruntfile.js
|
|
>>>>>>> v3
|