kennethreitz/python-guide
1
0
Fork 0
mirror of https://github.com/kennethreitz/python-guide.git synced 2026-06-05 14:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Previous merge didnt handle 2 conflicts properly

Browse Source
This commit is contained in:
Adam Nelson
2016-11-14 14:31:53 -05:00
parent e7ca528206
commit b832f669e6
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/dev/virtualenvs.rst
-4
View File
@@ -8,11 +8,7 @@ projects in separate places, by creating virtual Python environments for them.
It solves the "Project X depends on version 1.x but, Project Y needs 4.x"
dilemma, and keeps your global site-packages directory clean and manageable.
<<<<<<< HEAD
For example, you can work on a project which requires Django 1.9 while also
=======
For example, you can work on a project which requires Django 1.10 while also
>>>>>>> upstream/master
maintaining a project which requires Django 1.8.
virtualenv