Commit 11ac81d
committed
Simplify merging code
1 parent 133e8d7 commit 11ac81d
1 file changed
+6
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
349 | 349 | | |
350 | 350 | | |
351 | 351 | | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | 352 | | |
357 | 353 | | |
358 | 354 | | |
359 | | - | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
360 | 358 | | |
361 | 359 | | |
362 | 360 | | |
363 | | - | |
364 | | - | |
365 | | - | |
366 | | - | |
367 | 361 | | |
368 | 362 | | |
369 | | - | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
370 | 366 | | |
0 commit comments