Commit e20ee91
authored
Fix comments when they have a permalink to a file that doesn't exist locally (#6026)
* Fix resolve conflicts button in focus view
Fixes #5942
* Fix comments when they have a permalink to a file that doesn't exist locally
Fixes #6025
* Revert "Fix resolve conflicts button in focus view"
This reverts commit b589aa4.1 parent f9423bd commit e20ee91
1 file changed
Lines changed: 7 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
320 | 320 | | |
321 | 321 | | |
322 | 322 | | |
323 | | - | |
324 | | - | |
325 | | - | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
326 | 330 | | |
327 | 331 | | |
328 | 332 | | |
| |||
0 commit comments