Rm remaining merge conflict in comments (#10876)

airbytehq · Mar 5, 2022 · fbe084f · fbe084f
1 parent adea13c
commit fbe084f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...s/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowImpl.java b/...s/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowImpl.java
@@ -445,7 +445,7 @@ private void reportJobStarting() {
   }
 
   /**
-   * <<<<<<< HEAD Start the child SyncWorkflow ======= Start the child {@link SyncWorkflow}. We are
+   * Start the child {@link SyncWorkflow}. We are
    * using a child workflow here for two main reason:
    * <p>
    * - Originally the Sync workflow was living by himself and was launch by the scheduler. In order to
@@ -454,7 +454,7 @@ private void reportJobStarting() {
    * <p>
    * - The {@link SyncWorkflow} has different requirements than the {@link ConnectionManagerWorkflow}
    * since the latter is a long running workflow, in the future, using a different Node pool would
-   * make sense. >>>>>>> 76e969f2e5e1b869648142c3565b7375b1892999
+   * make sense.
    */
   private StandardSyncOutput runChildWorkflow(final GeneratedJobInput jobInputs) {
     final int taskQueueChangeVersion =