Change

Lyssa0 · Lyssa0 · commit c50614a96cf2 · 2022-07-08T14:12:30.000-05:00
diff --git a/Debugging Activity/The Assignment/example1.js b/Debugging Activity/The Assignment/example1.js
@@ -18,12 +18,9 @@ function checkPoint1() {
             array.push(x * 2);
         }
         return array;
-    }
-<<<<<<< HEAD
-    console.log(getMultiples());  
-=======
+    } 
     console.log(getMultiples()); 
->>>>>>> 242991cb30e2e26f0e2ee3f3a5a5c3fc1aed7a9c
+
 
     // DO NOT CHANGE THE CODE BELOW
     alert2();
