Oops

1 year ago · 4ad14b864c
1 changed files with 0 additions and 4 deletions
--- a/build-ff.js
+++ b/build-ff.js
@ -107,11 +107,7 @@ const manif = {
      define: {
        global: 'window',
        execution_mode: '"ff_api"',
-<<<<<<< HEAD
        manifest: '' + manif.manifest_version,
-=======
-        manifest: ''+manif.manifest_version,
->>>>>>> d5298ab (Breaking change fixes)
        isBackground: 'false',
        BUILD_VERSION: JSON.stringify([0, rev])
      },