I watched DoFP yesterday since it happened to be on. At the end, both Logan and Professor X remember the old timeline fully, since Wolverine said he needed to be told what happened after 1973. Xavier clearly knew what he was talking about and said “Welcome back.”