17/02/2022 12:09, Tomasz Duszynski: > --- a/doc/guides/rel_notes/release_22_03.rst > +++ b/doc/guides/rel_notes/release_22_03.rst > @@ -55,6 +55,7 @@ New Features > Also, make sure to start the actual text at the margin. > ======================================================= > > +<<<<<<< HEAD > * **Added ability to reuse hugepages in Linux.**
Will remove this rebase trace while merging.
