It was their first in-person meeting since Canada’s election amid a tense trade war between the two countries. Here’s a recap of what happened.