Update InfrastTask.cpp

Yumi0606 · Sep 15, 2023 · 1fdc9c1 · 1fdc9c1
1 parent c64ba48
commit 1fdc9c1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/MaaCore/Task/Interface/InfrastTask.cpp b/src/MaaCore/Task/Interface/InfrastTask.cpp
@@ -30,6 +30,10 @@ asst::InfrastTask::InfrastTask(const AsstCallback& callback, Assistant* inst)
 {
  LogTraceFunction;
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ InfrastAbstractTask::clear_opers_for_group();
+>>>>>>> parent of 6616e6a08... fix: Apply suggestions from code review
 =======
  InfrastAbstractTask::clear_opers_for_group();
 >>>>>>> parent of 6616e6a08... fix: Apply suggestions from code review