From 8916b853b9331f2ad51df4fcfd5d3fc528c1e195 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sat, 26 Jan 2013 18:09:12 -0800
Subject: [PATCH] Issue #14018: fix merge error

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0dea9248e6f..87dcf59a989 100644
--- 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/') )