Update foreman_proxy.py

Signed-off-by: Pablo Fernández Rodríguez <[email protected]>
sosreport · Sep 26, 2024 · f2bdbd6 · f2bdbd6
1 parent 1531f06
commit f2bdbd6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/sos/report/plugins/foreman_proxy.py b/sos/report/plugins/foreman_proxy.py
@@ -46,11 +46,7 @@ def setup(self):
             'HTTP_PROXY',
             'HTTPS_PROXY',
             'NO_PROXY',
-<<<<<<< HEAD
-            'ALL_PROXY'
-=======
             'ALL_PROXY',
->>>>>>> 41fa32b4 ([foreman] [foreman_proxy] Add ALL_PROXY and NO_PROXY to collected env_vars)
         ])
 
     def postproc(self):