merge conflict stupid shit

webdesigndecal · Feb 23, 2024 · 5da6225 · 5da6225
2 parents d76aecd + 8ddef0f
commit 5da6225
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/assignments/.DS_Store b/assignments/.DS_Store
diff --git a/assignments/hw3/index.html b/assignments/hw3/index.html
@@ -18,7 +18,11 @@
 				<!-- ASSIGNMENT NAME -->
 				<div id="header-title">Homework 3</div>
 				<!-- DUE DATE -->
+<<<<<<< HEAD
 				<div id="header-due">February 22</div>
+=======
+				<div id="header-due">February 23</div>
+>>>>>>> 8ddef0f26f4f2b704b8fda638ba2d503f4d57212
 				<div class="clear"></div>
 			</div>
 		</div>
@@ -128,7 +132,11 @@
 					<li>git commit -m 'finished hw3'</li>
 					<li>git push</li>
 				</ul>
+<<<<<<< HEAD
 				<p>This assignment is due <strong>Thursday, February 22nd</strong> at <strong>6:30PM PST</strong>.</p>
+=======
+				<p>This assignment is due <strong>Thursday, February 23rd</strong> at <strong>6:30PM PST</strong>.</p>
+>>>>>>> 8ddef0f26f4f2b704b8fda638ba2d503f4d57212
 			</div>
 		</div>
 	</div>

diff --git a/assignments/script.js b/assignments/script.js
@@ -1,5 +1,9 @@
 /* UPDATE FOR EVERY ASSIGNMENT: */
+<<<<<<< HEAD
 const assignments = ['lab1', 'hw1', 'lab2', 'hw2', 'lab3', 'hw3'];
+=======
+const assignments = ['lab1', 'hw1', 'lab2', 'hw2', 'hw3'];
+>>>>>>> 8ddef0f26f4f2b704b8fda638ba2d503f4d57212
 
 const template = document.getElementById('assignment-template');