Issue #14018: fix merge error

8916b853 · Ned Deily · 05997253 · 8916b853
Commit 8916b853 authored Jan 26, 2013 by Ned Deily
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

setup.py setup.py +0 -1

No files found.
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,6 @@ def is_macosx_sdk_path(path):
    """
    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/') )