File tree
2 files changed
+12
-11
lines changed- src/Workspaces
- CSharp/Portable/Rename
- Core/Portable/Rename/ConflictEngine
2 files changed
+12
-11
lines changedLines changed: 5 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
159 | 159 |
| |
160 | 160 |
| |
161 | 161 |
| |
162 |
| - | |
| 162 | + | |
163 | 163 |
| |
164 |
| - | |
| 164 | + | |
165 | 165 |
| |
166 |
| - | |
167 |
| - | |
168 |
| - | |
169 |
| - | |
170 |
| - | |
| 166 | + | |
| 167 | + | |
171 | 168 |
| |
172 | 169 |
| |
173 | 170 |
| |
| |||
298 | 295 |
| |
299 | 296 |
| |
300 | 297 |
| |
301 |
| - | |
| 298 | + | |
302 | 299 |
| |
303 | 300 |
| |
304 | 301 |
| |
|
Lines changed: 7 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
505 | 505 |
| |
506 | 506 |
| |
507 | 507 |
| |
508 |
| - | |
509 |
| - | |
510 |
| - | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
511 | 515 |
| |
512 | 516 |
| |
513 | 517 |
| |
|
0 commit comments