info/Web-Dev-For-Beginners
1
0
Fork 0
mirror of https://github.com/microsoft/Web-Dev-For-Beginners.git synced 2025-08-14 02:34:15 +02:00
Code Issues Projects Releases Wiki Activity

fixing conflict marks

Browse Source
This commit is contained in:
Jen Looper
2020-12-31 10:28:44 -05:00
parent 78ac76fb14
commit 46cfed00df
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
2-js-basics/3-making-decisions/README.md
View File

@@ -159,13 +159,8 @@ if (firstNumber > secondNumber) {
Create a program that is written first with logical operators, and then rewrite it using a ternary expression. What's your preferred syntax? Create a program that is written first with logical operators, and then rewrite it using a ternary expression. What's your preferred syntax?
<<<<<<< HEAD
##
Post-Lecture Quiz
=======
--- ---
## Post-Lecture Quiz ## Post-Lecture Quiz
>>>>>>> f3df930... Fixed Post/Pre Lecture Quiz position.
[Post-lecture quiz](https://nice-beach-0fe9e9d0f.azurestaticapps.net/quiz/12) [Post-lecture quiz](https://nice-beach-0fe9e9d0f.azurestaticapps.net/quiz/12)
## Review & Self Study ## Review & Self Study