Neither dies. In the 74th Hunger Games, Katniss Everdeen and Peeta Mellark become the first co-victors in the Games' history.
Faced with the Capitol's rule change revoking the dual-victor allowance, they threaten mutual suicide with nightlock berries—forcing the Gamemakers to concede. Both survive the arena.
In the broader trilogy: both survive Catching Fire and Mockingjay (though Peeta is hijacked/tortured, and Katniss endures profound trauma). The epilogue shows them married with children, decades later.
So: they live. Together. The berries were a bluff that became a revolution.