remove merge markers

appsmithorg · Sep 16, 2024 · 39aea09 · 39aea09
1 parent 708701c
commit 39aea09
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
@@ -2,13 +2,10 @@ import React, { useCallback } from "react";
 import { IDEToolbar } from "IDE";
 import { Button, Menu, MenuContent, MenuTrigger, Tooltip } from "@appsmith/ads";
 import { modText } from "utils/helpers";
-<<<<<<< HEAD
 import { usePluginActionContext } from "../PluginActionContext";
 import { useDispatch } from "react-redux";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { runAction } from "../../actions/pluginActionActions";
-=======
->>>>>>> release
 
 interface PluginActionToolbarProps {
   runOptions?: React.ReactNode;