From 4ad14b864c51125899255b567748455149387b65 Mon Sep 17 00:00:00 2001
From: Araragi Koyomi <araragi@noreply.%(DOMAIN)s>
Date: Fri, 23 Dec 2022 20:37:14 +0100
Subject: [PATCH] Oops

---
 build-ff.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build-ff.js b/build-ff.js
index e91cd05..6682cb5 100644
--- 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])
       },