summaryrefslogtreecommitdiffstats
path: root/python-pypi/distribute/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'python-pypi/distribute/CONFLICTS')
-rwxr-xr-xpython-pypi/distribute/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/python-pypi/distribute/CONFLICTS b/python-pypi/distribute/CONFLICTS
new file mode 100755
index 0000000000..bbc6bb7617
--- /dev/null
+++ b/python-pypi/distribute/CONFLICTS
@@ -0,0 +1 @@
+conflicts setuptools