They apparently got back together. Trump recently said of their relationship:
"I like Elon. I've always liked Elon." and "He's a nice guy. And he's a very capable guy. I've always liked him. He had a bad spell. He had a bad period. He had a bad moment. It was a stupid moment in his life. Very stupid. I'm sure he'd tell you that. But I like Elon and I suspect I'll always like him."