summaryrefslogtreecommitdiff
path: root/pkg/tools
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-08-23 01:30:33 -0400
committerKali Kaneko <kali@leap.se>2017-08-30 16:18:05 -0400
commit34d59f070d13ec2ac09c07cc7e0ec6a5d559fef9 (patch)
tree77ccf403971be03d9ae37c59e331422375dcd503 /pkg/tools
parent8b77f3155288d51197dfa1082dd3e7079a9d7620 (diff)
[bug] fix bad merge
Diffstat (limited to 'pkg/tools')
-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():