After Gabriel Aubry and Halle Berry's court date ended amicably yesterday, ET has learned that Aubry has dropped a restraining order against Berry's fiance Olivier Martinez.
Last week, according to police sources, a fight broke out when Berry's ex, Aubry, was dropping off their four-year-old daughter together, Nahla, to the actress' house for Thanksgiving.
The next day, Aubry was granted a temporary restraining order against Martinez.
At the time, Aubry wrote that he feared for his "physical safety" when he was in Martinez's presence.
News of Aubry dropping the order comes after the model was snapped with Nahla, after school let out on Friday.
Berry and Aubry's attornies met on Thursday over whether or not Aubry would resume visitation with Nahla. The two sides were said to have come to an agreement.