Correctly resolve rebase conflict

This commit is contained in:
Robin North
2018-02-01 08:45:53 +00:00
parent 258d66f9cf
commit a893dfdc3b

View File

@@ -17,7 +17,7 @@ module.exports = function(el) {
if (src !== "") { if (src !== "") {
script.src = src script.src = src
script.async = false // force asynchronous loading of peripheral js script.async = false // force synchronous loading of peripheral js
} }
if (code !== "") { if (code !== "") {