resolved conflicts..

This commit is contained in:
Marcell Mars 2022-01-07 23:05:15 +01:00
parent 9d5ecffd80
commit c491a6b0b0

View file

@ -1,7 +1,6 @@
+++
has_topics = ["media.md", "migration.md", "governance.md"]
title = "Summer School 2022 - Solidarity, Refuge, Sanctuary: Critical, aesthetic and technological practices in migration research"
>>>>>>> 1fce54c21fee66a9296ed03216fdad7aea96e052
+++
# Summer School 2023