Fixed accidental merge conflicts after merging main in

Author: adamblanchard

legacy/html-and-css/Pre-course/README.md

@@ -1,14 +1,8 @@
-# Self study
+# Pre-course materials
 
-<<<<<<<< HEAD:courses/Pre-Course/Self-Study/readme.md
-This module lists the steps you have to complete **BEFORE** the Foundation course starts. <br>
-
-You are going to be fully self-learning `HTML` and `CSS`, so it is very important and **mandatory** that you complete the steps before the first Sunday session at HackYourFuture. <br>
-========
 This section lists the steps you have to complete **BEFORE** the bootcamp starts.
 
 You are going to be fully self-learning `HTML` and `CSS`, so it is very important and **mandatory** that you complete the steps before the first sunday session at HackYourFuture.
->>>>>>>> main:legacy/html-and-css/Pre-course/README.md
 
 You will also get a little introduction to `Javascript`, so that you can be more comfortable jumping into it when the course starts.
 
@@ -18,14 +12,10 @@ You will also get a little introduction to `Javascript`, so that you can be more
 
 The `freeCodeCamp` courses are a good way to learn and their certifications are widely recognized, therefore we use this platform to give you a good start with learning `Web Development` and having a way to showcase your learning.
 
-<<<<<<<< HEAD:courses/Pre-Course/Self-Study/readme.md
-### What you have completed already
-========
 ### What you have done so far
->>>>>>>> main:legacy/html-and-css/Pre-course/README.md
 
 There are 5 parts in the [Responsive Web Design certification](https://www.freecodecamp.org/learn/2022/responsive-web-design/). Each part contains a few sections and a certification project at the end of each part.
-You have already finished at least 2 sections from the first part as part of the application process:
+You have already finished at least 2 sections from the first part as part of the application assignment:
 
 - [Learn HTML by Building a Cat Photo App](https://www.freecodecamp.org/learn/2022/responsive-web-design/learn-html-by-building-a-cat-photo-app/)
 
@@ -81,22 +71,14 @@ Complete these steps in the freeCodeCamp [JavaScript Algorithms and Data Structu
 
 If you like the `freeCodeCamp` format, you should definitely continue beyond what we ask of you and attain the various relevant certifications - especially by finishing off the **Responsive Web Design** and **Javascript Algorithms and Data Structures** certifications!
 
-<<<<<<<< HEAD:courses/Pre-Course/Self-Study/readme.md
-## Submitting your preparation
-========
 ### Submitting your preparation
->>>>>>>> main:legacy/html-and-css/Pre-course/README.md
 
-Before the first Sunday session, you must have completed all the steps listed above. You then need to make your freeCodeCamp profile public - [Video here to show you how to do this](https://www.loom.com/share/019547eab49e4e198fd2d24f6cb27d3c) - and post a link to your profile in your team Slack channel. If you do not do this before the first Sunday session, you will not be able to continue with the course.
+Before the first Sunday session, you must have completed all the steps listed above. You then need to make your freeCodeCamp profile public - [Video here to show you how to do this](https://www.loom.com/share/019547eab49e4e198fd2d24f6cb27d3c) - and post a link to your profile in your class Slack channel. If you do not do this before the first Sunday session, you will not be able to continue with the course.
 
-<<<<<<<< HEAD:courses/Pre-Course/Self-Study/readme.md
-## FAQ
-========
 ### What if?
->>>>>>>> main:legacy/html-and-css/Pre-course/README.md
 
 - If you have completed all these parts already, just continue further with the certifications. You are here to learn after all and you are entering a journey of self-teaching!
 
 - If you have not completed the steps listed above from the `Responsive Web Design` ceritification and the `JavaScript Algorithms and Data Structures` certification by the time of the first Sunday session, you will not be able to continue with the course.
 
-- Stuck or need help? Please use your team Slack channel to ask for help from your fellow trainees. Asking for help, explaining the problems you have, and sharing your own knowledge with your fellow trainees are all very important skills to succeed in HackYourFuture, so start practicing right now!
+- Stuck or need help? Please use your class Slack channel to ask for help from your fellow students. Asking for help, explaining the problems you have, and sharing your own knowledge with your fellow students are all very important to succeed in HackYourFuture, so start practicing right now!