(LOS ANGELES) -- Halle Berry and her ex, Gabriel Aubry, have reached some sort of settlement stemming from his fight on Thanksgiving Day with her fiancé, Olivier Martinez, at her Los Angeles home.
Following the fight, Aubry was ordered to stay 100 yards away from Berry, Martinez, and Aubry's 4-year-old daughter with Berry, Nahla.
Aubry obtained a temporary restraining order against Martinez this week.
The Thanksgiving incident was the subject of a court hearing Thursday in Los Angeles. Attorneys said an "amicable" agreement was reached, but the terms were not disclosed, according to ABC News affiliate KABC-TV in Los Angeles.
Meanwhile, the five-bedroom, 5,900-square-foot Tuscan-style estate where the fight took place is now on the market for $15 million, reports TMZ.com.
Multiple real estate sources tell TMZ that a few weeks ago Berry gave a prominent realtor a pocket listing, which means the property isn't advertised as being for sale.
The broker, whose name is Billy Rose, is with a company called The Agency. Rose actually owned the house about 10 years ago, but he renovated it and sold it to actor Frankie Muniz, who eventually sold it to Berry a couple of years later.
Berry has already received an $11 million offer for the property, but sources say that she's holding out for more.
Copyright 2012 ABC News Radio