summaryrefslogtreecommitdiff
path: root/sphinx/setup_command.py
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2014-01-22 18:42:53 +0400
committerDmitry Shachnev <mitya57@gmail.com>2014-01-22 18:42:53 +0400
commitcf25b060e7357ddf850503feae11ddb27b87d769 (patch)
tree7c10de2dfaa41b0e2316d8618bb9fe885810adef /sphinx/setup_command.py
parente7293f1dee54c1fe36d19bdf3512eb11580cbb90 (diff)
downloadsphinx-git-cf25b060e7357ddf850503feae11ddb27b87d769.tar.gz
Resolve some conflicts
Diffstat (limited to 'sphinx/setup_command.py')
0 files changed, 0 insertions, 0 deletions