Anglelina Jolie & Her dad Jon Voight have made up!

They were seen together — with the rest of the Pitt-Jolie clan — floating down Venice’s Grand Canal in Italy yesterday!

Says a source:

“Angie & her dad are slowly getting their relationship back on track after many years of being at odds.”