From c491a6b0b0bafda887b78dff73b7083b779a7349 Mon Sep 17 00:00:00 2001
From: Marcell Mars <ki.ber@kom.uni.st>
Date: Fri, 7 Jan 2022 23:05:15 +0100
Subject: [PATCH] resolved conflicts..

---
 content/syllabus/index.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/syllabus/index.md b/content/syllabus/index.md
index 66ee4b4..e5da236 100644
--- a/content/syllabus/index.md
+++ b/content/syllabus/index.md
@@ -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