merging conflicts

cs10 · Jul 24, 2024 · 86228eb · 86228eb
2 parents d94f42c + 437291d
commit 86228eb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/calendar.md b/calendar.md
@@ -372,7 +372,7 @@
       <td>No Lecture</td> <!-- Lecture -->
       <td>No Lab</td> <!-- Lab -->
       <td>No Discussion</td> <!-- Discussion -->
-      <td>Final Project Proposals Due</td> <!-- Assignment -->
+      <td></td> <!-- Assignment -->
     </tr>
     <!-- WEEK SEVEN ------------------------------------------------------------ -->
     <tr>