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

    r92355883 r2a301ff  
    165165        1 1 1.00 45.00 90.00
    166166         2700 2625 3000 2400
    167 4 1 0 50 -1 0 11 0.0000 2 135 885 1500 1350 Static Zone\001
    168 4 1 0 50 -1 0 11 0.0000 2 195 495 2550 1725 H$_1$\001
    169 4 1 0 50 -1 0 11 0.0000 2 180 1950 4050 1350 Dynamic-Allocation Zone\001
    170 4 1 0 50 -1 0 11 0.0000 2 135 225 1650 1725 Hs\001
    171 4 1 0 50 -1 0 11 0.0000 2 195 495 2550 2625 H$_3$\001
    172 4 1 0 50 -1 0 11 0.0000 2 195 495 2550 2175 H$_2$\001
     1674 1 0 50 -1 0 10 0.0000 2 135 885 1500 1350 Static Zone\001
     1684 1 0 50 -1 0 10 0.0000 2 195 495 2550 1725 H$_1$\001
     1694 1 0 50 -1 0 10 0.0000 2 180 1950 4050 1350 Dynamic-Allocation Zone\001
     1704 1 0 50 -1 0 10 0.0000 2 135 225 1650 1725 Hs\001
     1714 1 0 50 -1 0 10 0.0000 2 195 495 2550 2625 H$_3$\001
     1724 1 0 50 -1 0 10 0.0000 2 195 495 2550 2175 H$_2$\001
Note: See TracChangeset for help on using the changeset viewer.