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/FakeHeader.fig

    r92355883 r2a301ff  
    1717        1 1 1.00 45.00 90.00
    1818         2925 1950 2625 1950 2625 1800
    19 4 1 0 50 -1 0 12 0.0000 2 135 450 3450 1725 offset\001
    20 4 1 0 50 -1 0 12 0.0000 2 180 825 1950 1725 alignment\001
    21 4 1 0 50 -1 0 12 0.0000 2 135 105 2625 1725 1\001
    22 4 0 0 50 -1 0 12 0.0000 2 180 1920 3000 2025 alignment (fake header)\001
    23 4 1 0 50 -1 0 12 0.0000 2 180 765 1950 1425 4/8-bytes\001
    24 4 1 0 50 -1 0 12 0.0000 2 180 765 3450 1425 4/8-bytes\001
     194 1 0 50 -1 0 10 0.0000 2 135 450 3450 1725 offset\001
     204 1 0 50 -1 0 10 0.0000 2 180 825 1950 1725 alignment\001
     214 1 0 50 -1 0 10 0.0000 2 135 105 2625 1725 1\001
     224 0 0 50 -1 0 10 0.0000 2 180 1920 3000 2025 alignment (fake header)\001
     234 1 0 50 -1 0 10 0.0000 2 180 765 1950 1425 4/8-bytes\001
     244 1 0 50 -1 0 10 0.0000 2 180 765 3450 1425 4/8-bytes\001
Note: See TracChangeset for help on using the changeset viewer.