|
@ -107,11 +107,7 @@ const manif = { |
|
|
define: { |
|
|
define: { |
|
|
global: 'window', |
|
|
global: 'window', |
|
|
execution_mode: '"ff_api"', |
|
|
execution_mode: '"ff_api"', |
|
|
<<<<<<< HEAD |
|
|
|
|
|
manifest: '' + manif.manifest_version, |
|
|
manifest: '' + manif.manifest_version, |
|
|
======= |
|
|
|
|
|
manifest: ''+manif.manifest_version, |
|
|
|
|
|
>>>>>>> d5298ab (Breaking change fixes) |
|
|
|
|
|
isBackground: 'false', |
|
|
isBackground: 'false', |
|
|
BUILD_VERSION: JSON.stringify([0, rev]) |
|
|
BUILD_VERSION: JSON.stringify([0, rev]) |
|
|
}, |
|
|
}, |
|
|