From 34d59f070d13ec2ac09c07cc7e0ec6a5d559fef9 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 23 Aug 2017 01:30:33 -0400 Subject: [bug] fix bad merge --- pkg/tools/upgrade_all.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'pkg') 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(): -- cgit v1.2.3