Fixed executor, removed extra code when not self._enabled or self._dr…

…y_run
mmacchia · Jun 4, 2022 · de668cd · de668cd
1 parent 12ee359
commit de668cd
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/poetry/installation/executor.py b/src/poetry/installation/executor.py
@@ -311,11 +311,6 @@ def _do_execute_operation(self, operation: Operation) -> int:
             return 0
 
         if not self._enabled or self._dry_run:
-<<<<<<< HEAD:src/poetry/installation/executor.py
-            self._io.write_line(f"  <fg=blue;options=bold>•</> {operation_message}")
-
-=======
->>>>>>> 73b6da5e (Executor: Remove duplicate entry with dry-run argument):poetry/installation/executor.py
             return 0
 
         result: int = getattr(self, f"_execute_{method}")(operation)