From 46cfed00df88b2212ef3d3690901a2a59ddff958 Mon Sep 17 00:00:00 2001
From: Jen Looper <jen.looper@gmail.com>
Date: Thu, 31 Dec 2020 10:28:44 -0500
Subject: [PATCH] fixing conflict marks

---
 2-js-basics/3-making-decisions/README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/2-js-basics/3-making-decisions/README.md b/2-js-basics/3-making-decisions/README.md
index 0b60fa16..3b1c34c9 100644
--- a/2-js-basics/3-making-decisions/README.md
+++ b/2-js-basics/3-making-decisions/README.md
@@ -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?
 
-<<<<<<< HEAD
-## 
-Post-Lecture Quiz
-=======
 ---
 ## Post-Lecture Quiz
->>>>>>> f3df930... Fixed Post/Pre Lecture Quiz position.
 [Post-lecture quiz](https://nice-beach-0fe9e9d0f.azurestaticapps.net/quiz/12)
 
 ## Review & Self Study