Ignore:
Timestamp:
Aug 31, 2023, 11:31:15 PM (2 years ago)
Author:
JiadaL <j82liang@…>
Branches:
master
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/AllocatedObject.fig

    r92355883 r2a301ff  
    22222 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    2323         4800 1200 4800 1500
    24 4 1 0 50 -1 0 11 0.0000 2 135 555 1650 1425 Header\001
    25 4 1 0 50 -1 0 11 0.0000 2 180 600 2550 1425 Padding\001
    26 4 1 0 50 -1 0 11 0.0000 2 180 510 3450 1425 Object\001
    27 4 1 0 50 -1 0 11 0.0000 2 180 600 4350 1425 Spacing\001
    28 4 1 0 50 -1 0 11 0.0000 2 135 495 5250 1425 Trailer\001
     244 1 0 50 -1 0 10 0.0000 2 135 555 1650 1425 Header\001
     254 1 0 50 -1 0 10 0.0000 2 180 600 2550 1425 Padding\001
     264 1 0 50 -1 0 10 0.0000 2 180 510 3450 1425 Object\001
     274 1 0 50 -1 0 10 0.0000 2 180 600 4350 1425 Spacing\001
     284 1 0 50 -1 0 10 0.0000 2 135 495 5250 1425 Trailer\001
Note: See TracChangeset for help on using the changeset viewer.