From a009c0658247e4c2b802edfd8bf6678f2c5cae40 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Sat, 17 Oct 2020 15:05:18 +0100 Subject: [PATCH 1/3] Revert "Replace Ed with Edward" This reverts commit 78192b2703b3cf3287b88e0ce4580d8f784adb5d. --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cda35dc..63cf432 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Some of the technologies we use at Code Your Future * Languages: We teach HTML, CSS, and Javascript. * Frameworks: React, Node. * Database technologies: Either MongoDB or SQL. -* Edwarditor: We recommend VS Code. +* Editor: We recommend VS Code. * Source Control: Git, Github, and Github Desktop. People @@ -12,4 +12,13 @@ People There are loads of people who make Code Your Future what it is, we couldn't name them all here! +<<<<<<< HEAD One of the things that makes Code Your Future special compared to other similar organisations is that we have an amazing PD team. Special shout-out to Anisa, Candy, Ben, Beth, Edward, Usman, and all of our other PD team members! + +Contact +======= + +If you want to contact us, you can send an email to contact@codeyourfuture.io +======= +One of the things that makes Code Your Future special compared to other similar organisations is that we have an amazing PD team. Special shout-out to Anisa, Candy, Ben, Beth, Ed, Usman, and all of our other PD team members! +>>>>>>> parent of 78192b2 (Replace Ed with Edward) From 787291c4d11feb63a0e875958c3f462cc89ffae9 Mon Sep 17 00:00:00 2001 From: lazar-eva <103130591+lazar-eva@users.noreply.github.com> Date: Sat, 14 Jan 2023 14:56:29 +0000 Subject: [PATCH 2/3] Double info deleted --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index c039cd4..023eb4c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,5 @@ Contact ======= If you want to contact us, you can send an email to contact@codeyourfuture.io -<<<<<<< HEAD -======= -One of the things that makes Code Your Future special compared to other similar organisations is that we have an amazing PD team. Special shout-out to Anisa, Candy, Ben, Beth, Ed, Usman, and all of our other PD team members! + From f01b5d02d295012f5630bdb24487dd41bb882409 Mon Sep 17 00:00:00 2001 From: lazar-eva <103130591+lazar-eva@users.noreply.github.com> Date: Sat, 14 Jan 2023 14:58:04 +0000 Subject: [PATCH 3/3] Typo deleted --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 023eb4c..8c66824 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ People There are loads of people who make Code Your Future what it is, we couldn't name them all here! -<<<<<<< HEAD One of the things that makes Code Your Future special compared to other similar organisations is that we have an amazing PD team. Special shout-out to Anisa, Candy, Ben, Beth, Edward, Usman, and all of our other PD team members! Contact