From de668cda0e719dbdce38e592f3b111977503ae8a Mon Sep 17 00:00:00 2001
From: mmacchia <macchia.marco90@gmail.com>
Date: Sat, 4 Jun 2022 11:44:54 +0200
Subject: [PATCH] Fixed executor, removed extra code when not self._enabled or
 self._dry_run

---
 src/poetry/installation/executor.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/poetry/installation/executor.py b/src/poetry/installation/executor.py
index aff14ccd145..4cb60ee98c2 100644
--- 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)