The fisticuffs involved Berry's ex-boyfriend Gabriel Aubry and her fiance, actor Olivier Martinez. Aubry was arrested after the fight, which left him with a black eye, a broken rib and other injuries.
Aubry obtained a temporary restraining order against Martinez. The model and Berry have been battling over custody of their 4-year-old daughter for months and have appeared twice in a family law court since the fight.
Blair Berk, an attorney for Berry, and Shawn Holley, who represents Aubry, released a statement after Thursday's hearing that said the two sides had reached an amicable agreement.
No details were released, and the attorneys declined to answer questions.