commit | 4511e276d57f2ff1a902e3f5ef8a24103292e7db | [log] [tgz] |
---|---|---|
author | Ned Deily <nad@acm.org> | Sat Jan 26 18:08:22 2013 -0800 |
committer | Ned Deily <nad@acm.org> | Sat Jan 26 18:08:22 2013 -0800 |
tree | 509a9ea9ce4180419b57e0f7d72dc6d2cce605ba | |
parent | c19d7b6556b6b0a8e2ad84fab99feeff4fb4f7de [diff] |
Issue #14018: fix merge error
diff --git a/setup.py b/setup.py index 1791fbe..6a503c0 100644 --- a/setup.py +++ b/setup.py
@@ -47,7 +47,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/') )