Commit 19edc54
committed
fix a merge issue, and load sysconfig always in non _mswindows case
1 parent b40b534 commit 19edc54
1 file changed
+5
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
126 | 128 | | |
127 | 129 | | |
128 | 130 | | |
129 | | - | |
130 | 131 | | |
131 | 132 | | |
132 | 133 | | |
| |||
2172 | 2173 | | |
2173 | 2174 | | |
2174 | 2175 | | |
2175 | | - | |
2176 | | - | |
2177 | | - | |
2178 | | - | |
| 2176 | + | |
| 2177 | + | |
| 2178 | + | |
2179 | 2179 | | |
2180 | 2180 | | |
2181 | 2181 | | |
| |||
0 commit comments