best-cost / best-cost_WPs

This repository aim to collect the confidential (not public) work of the EU project BEST-COST in the framework of the workpackages (WPs).
1 stars 0 forks source link

Update branch 314 from master #327

Closed arnopauwels closed 3 weeks ago

luytax commented 3 weeks ago

The conflict is fixed, so now you should be able to merge. Once you've done it, don't forget to pull the changes in RStudio while you're on the 314 branch to bring the files on your laptop up to date.

arnopauwels commented 3 weeks ago

Thanks Axel, everything worked fine!