the profanities in the previous commit were from yavid, i do not curse

webdesigndecal · Feb 23, 2024 · c3eb91a · c3eb91a
1 parent 5da6225
commit c3eb91a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/assignments/script.js b/assignments/script.js
@@ -1,9 +1,7 @@
 /* UPDATE FOR EVERY ASSIGNMENT: */
-<<<<<<< HEAD
-const assignments = ['lab1', 'hw1', 'lab2', 'hw2', 'lab3', 'hw3'];
-=======
-const assignments = ['lab1', 'hw1', 'lab2', 'hw2', 'hw3'];
->>>>>>> 8ddef0f26f4f2b704b8fda638ba2d503f4d57212
+
+const assignments = ['lab1', 'hw1', 'lab2', 'hw2', 'lab3', 'hw3', 'midterm'];
+
 
 const template = document.getElementById('assignment-template');