| commit | 8916b853b9331f2ad51df4fcfd5d3fc528c1e195 | [log] [tgz] |
|---|---|---|
| author | Ned Deily <nad@acm.org> | Sat Jan 26 18:09:12 2013 -0800 |
| committer | Ned Deily <nad@acm.org> | Sat Jan 26 18:09:12 2013 -0800 |
| tree | d55c709c167dab935f5332229da6cee012245bf0 | |
| parent | 059972535fcefc524da52f057c6de22d10646655 [diff] |
Issue #14018: fix merge error
diff --git a/setup.py b/setup.py index 0dea924..87dcf59 100644 --- a/setup.py +++ b/setup.py
@@ -59,7 +59,6 @@ """ Returns True if 'path' can be located in an OSX SDK """ - return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/') return ( (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/') or path.startswith('/Library/') )