pierrejeambrun commented on code in PR #56924:
URL: https://github.com/apache/airflow/pull/56924#discussion_r2460738927
##########
airflow-core/src/airflow/ui/src/components/NeedsReviewButton.tsx:
##########
@@ -20,7 +20,11 @@ import { Box } from "@chakra-ui/react";
import { useTranslation } from "react-i18next";
import { LuUserRoundPen } from "react-icons/lu";
+<<<<<<< HEAD
import { useTaskInstanceServiceGetHitlDetails } from "openapi/queries";
+=======
+import { useHumanInTheLoopServiceGetHitlDetails } from "openapi/queries";
+>>>>>>> bb09da4770 (Add autorefresh to Required Actions button (#55543))
Review Comment:
Conflict marker that need to be addressed
##########
airflow-core/src/airflow/ui/src/components/NeedsReviewButton.tsx:
##########
@@ -20,7 +20,11 @@ import { Box } from "@chakra-ui/react";
import { useTranslation } from "react-i18next";
import { LuUserRoundPen } from "react-icons/lu";
+<<<<<<< HEAD
import { useTaskInstanceServiceGetHitlDetails } from "openapi/queries";
+=======
+import { useHumanInTheLoopServiceGetHitlDetails } from "openapi/queries";
+>>>>>>> bb09da4770 (Add autorefresh to Required Actions button (#55543))
Review Comment:
Example of conflict marker that need to be addressed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
