If the sentence says "aujourd'hui," conjugate in the present tense, if it says "hier," conjugate in the passé composé.