typs

txt · Sep 30, 2024 · bd1b1cc · bd1b1cc
1 parent 4876a75
commit bd1b1cc
Showing 1 changed file with 10 additions and 56 deletions.
diff --git a/docs/timetable.html b/docs/timetable.html
@@ -49,11 +49,6 @@ <h1 class="title">Timetable</h1>
 </header>
 <p><br clear=all></p>
 <table>
-<colgroup>
-<col style="width: 18%" />
-<col style="width: 53%" />
-<col style="width: 28%" />
-</colgroup>
 <thead>
 <tr>
 <th style="text-align: left;">What</th>
@@ -82,59 +77,18 @@ <h1 class="title">Timetable</h1>
 <td style="text-align: left;">Wellness day</td>
 <td>no class</td>
 </tr>
-<tr>
-<td style="text-align: left;">Sep26</td>
-<td style="text-align: left;"><a href="hw3.html">Tut3</a></td>
-<td></td>
-</tr>
-<tr>
-<td style="text-align: left;">Oct1</td>
-<td style="text-align: left;">Lit review due</td>
-<td><a href="litreview.html">About lit Review</a> <a
-href="stats.html">stats</a></td>
-</tr>
-<tr>
-<td style="text-align: left;">Oct3</td>
-<td style="text-align: left;"><a href="hw4.html">Tut4</a></td>
-<td></td>
-</tr>
-<tr>
-<td style="text-align: left;">Oct10</td>
-<td style="text-align: left;">Tut5</td>
-<td></td>
-</tr>
-<tr>
-<td style="text-align: left;">Oct15</td>
-<td style="text-align: left;">Fall break</td>
-<td>no class</td>
-</tr>
-<tr>
-<td style="text-align: left;">Oct17</td>
-<td style="text-align: left;">Mid term exam</td>
-<td>no class</td>
-</tr>
-<tr>
-<td style="text-align: left;">Oct31</td>
-<td style="text-align: left;">Paper1 due</td>
-<td></td>
-</tr>
-<tr>
-<td style="text-align: left;">Nov28</td>
-<td style="text-align: left;">Thanksgiving</td>
-<td>no class</td>
-</tr>
-<tr>
-<td style="text-align: left;">Dec3</td>
-<td style="text-align: left;">Paper2 due</td>
-<td>no class</td>
-</tr>
-<tr>
-<td style="text-align: left;">Dec5</td>
-<td style="text-align: left;">Final exam (*)</td>
-<td></td>
-</tr>
 </tbody>
 </table>
+<p>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD |Sep26 | Tut4 | | |Oct1 | Lit
+review due | <a href="litreview.html">About lit Review</a>; <br><a
+href="stats.html">stats</a> | |Oct3 | Tut5 | | |Oct10 | Mid term exam |
+| ======= |Sep26 | <a href="hw3.html">Tut3</a> | | |Oct1 | Lit review
+due | <a href="litreview.html">About lit Review</a> | |Oct3 | <a
+href="hw4.html">Tut4</a> | | |Oct10 | Tut5 | |
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; a268a3f90a91c5de7dec7c21ac3415bfe529b292
+|Oct15 | Fall break | no class| |Oct17 | Mid term exam | no class|
+|Oct31 | Paper1 due | | |Nov28 | Thanksgiving | no class| |Dec3 | Paper2
+due | no class| |Dec5 | Final exam (*) | |</p>
 <p>(*) Only for those who want to replace 100% of their tutorial and mid
 term grade with a new value.</p>