Correctly resolve rebase conflict
This commit is contained in:
1 parent
258d66f9cf
commit
a893dfdc3b
1 file changed
+1
-1
+1
-1
@@ -17,7 +17,7 @@ module.exports = function(el) {
|
||||
|
||||
if (src !== "") {
|
||||
script.src = src
|
||||
script.async = false // force asynchronous loading of peripheral js
|
||||
script.async = false // force synchronous loading of peripheral js
|
||||
}
|
||||
|
||||
if (code !== "") {
|
||||
|
||||
Reference in new issue
Block a user