summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/tools/upgrade_all.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkg/tools/upgrade_all.py b/pkg/tools/upgrade_all.py
index d297e42d..0732285d 100644
--- a/pkg/tools/upgrade_all.py
+++ b/pkg/tools/upgrade_all.py
@@ -5,13 +5,8 @@ import pip
from subprocess import call
if not os.environ.get('VIRTUAL_ENV'):
-<<<<<<< HEAD
print('[!] Should call this script inside a virtualenv, I do not want to '
'mess with your system. Bye!')
-=======
- print('[!] Should call this script inside a virtualenv, I do not want to mess '
- 'with your system. Bye!')
->>>>>>> 135aa3ac... [docs] add ability to upgrade an existing virtualenv
sys.exit(1)
for dist in pip.get_installed_distributions():