Ignore:
Timestamp:
Aug 31, 2023, 11:31:15 PM (2 years ago)
Author:
JiadaL <j82liang@…>
Branches:
master, stuck-waitfor-destruct
Children:
950c58e
Parents:
92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/papers/llheap/figures/Container.fig

    r92355883 r2a301ff  
    11112 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
    1212         1275 1200 2025 1200 2025 1500 1275 1500 1275 1200
    13 4 1 0 50 -1 0 11 0.0000 2 135 555 1650 1425 Header\001
     134 1 0 50 -1 0 10 0.0000 2 135 555 1650 1425 Header\001
    1414-6
    15156 1950 1125 2850 1575
    16162 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
    1717         2025 1200 2775 1200 2775 1500 2025 1500 2025 1200
    18 4 1 0 50 -1 0 11 0.0000 2 195 870 2400 1425 Object$_1$\001
     184 1 0 50 -1 0 10 0.0000 2 195 870 2400 1425 Object$_1$\001
    1919-6
    20206 2700 1125 3600 1575
    21212 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
    2222         2775 1200 3525 1200 3525 1500 2775 1500 2775 1200
    23 4 1 0 50 -1 0 11 0.0000 2 195 870 3150 1425 Object$_2$\001
     234 1 0 50 -1 0 10 0.0000 2 195 870 3150 1425 Object$_2$\001
    2424-6
    25256 3450 1125 4350 1575
    26262 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
    2727         3525 1200 4275 1200 4275 1500 3525 1500 3525 1200
    28 4 1 0 50 -1 0 11 0.0000 2 195 870 3900 1425 Object$_3$\001
     284 1 0 50 -1 0 10 0.0000 2 195 870 3900 1425 Object$_3$\001
    2929-6
Note: See TracChangeset for help on using the changeset viewer.