217f1cd42c
Conflicts: CHANGELOG.md Gruntfile.coffee LICENSE builds/4chan-X.js builds/4chan-X.meta.js builds/crx/manifest.json builds/crx/script.js latest.js package.json src/General/Main.coffee src/Linkification/Linkify.coffee
6 lines
103 B
JavaScript
6 lines
103 B
JavaScript
<<<<<<< HEAD
|
|
postMessage({version:'2.2.2'},'*')
|
|
=======
|
|
postMessage({version:'1.2.25'},'*')
|
|
>>>>>>> v3
|