From da3e99febcac6a3ca4197b33c6b2387c7b53ad0e Mon Sep 17 00:00:00 2001
From: Enrique Barcelli <kiko@barcelli.net>
Date: Fri, 16 Aug 2024 17:59:27 +0800
Subject: [PATCH] Fix link

---
 Conceptualisation ToR.md => ConceptualisationToR.md | 0
 README.md                                           | 4 ++++
 2 files changed, 4 insertions(+)
 rename Conceptualisation ToR.md => ConceptualisationToR.md (100%)

diff --git a/Conceptualisation ToR.md b/ConceptualisationToR.md
similarity index 100%
rename from Conceptualisation ToR.md
rename to ConceptualisationToR.md
diff --git a/README.md b/README.md
index 2bc8cc1..ac7d146 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,11 @@ Develop and sustain a healty community of 'makers' in Singapore by promoting the
 
 ### Project phases
 
+<<<<<<< HEAD
 - [Conceptualisation]("Conceptualisation ToR.md")
+=======
+- [Conceptualisation](ConceptualisationToR.md)
+>>>>>>> 17339ef (Fix link)
 
 - Pilot Design and Development