idk

replugged-org · Nov 2, 2023 · 8bff7ac · 8bff7ac
1 parent 1d4b48b
commit 8bff7ac
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/renderer/coremods/contextMenu/plaintextPatches.ts b/src/renderer/coremods/contextMenu/plaintextPatches.ts
@@ -7,15 +7,11 @@ export default [
       {
         match: /((\w+)\){)(var\s*\w+;let{navId:)/,
         replace: (_, prefix, menu, suffix) =>
-<<<<<<< HEAD
           `${prefix}const patchedMenu=replugged.coremods.coremods.contextMenu._buildPatchedMenu(${menu});${suffix}`,
       },
       {
         match: /(patchedMenu.{2400,2600}return)(\(0,.\.jsx\)\(\w+.OnMenuSelectContext)/,
         replace: (_, prefix, suffix) => `${prefix} patchedMenu?patchedMenu:${suffix}`,
-=======
-          `${prefix}replugged.coremods.coremods.contextMenu._insertMenuItems(${menu});${suffix}`,
->>>>>>> e6dc5f6e17159dce8ffba344c35a8187a39edb4b
       },
     ],
   },