Skip to content

Commit

Permalink
merging conflict and adding lec 21
Browse files Browse the repository at this point in the history
  • Loading branch information
jedi-force committed Jul 24, 2024
2 parents 20bc9bb + 90c8932 commit 766999f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions calendar.md
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
<a href="https://www.gradescope.com/courses/782967/assignments/4660909">(Lecture Quiz)</a>
</td> <!-- Lecture -->
<td><a href="https://docs.google.com/document/d/1pAnykqCmLdvEe4vuv2YGZ6ArnLV-UeliCZE9hbXQmlo/edit?usp=sharing">Lab 16, Part 2</a></td> <!-- Lab -->
<td rowspan="2">Disc 10:<br/>
<td rowspan="2"><a href="https://docs.google.com/document/d/1ul0g6_ExvZVpn9SI3vJYyOx2vjM773Pl/edit?usp=sharing&ouid=100628398912857125629&rtpof=true&sd=true">Disc 10: Object-Oriented Programming and Recursion in Python</a><br/>
</td> <!-- Discussion -->
<td><br/>
</td> <!-- Assignment -->
Expand All @@ -335,7 +335,7 @@
</td> <!-- Lecture -->
<td>
<!-- -->
Lab 17: Recursion <br />
<a href="https://docs.google.com/document/d/1rA-ptInPcepk7KCoHyNkr-dcyky6zzNS5O4C7UcDoE0/edit#heading=h.ew4i1encppj2">Lab 17: Recursion</a> <br />
<!-- -->
</td> <!-- Lab -->
<!-- <td></td>Discussion -->
Expand All @@ -345,7 +345,8 @@
<th>Wed 7/24 </th> <!-- Date -->
<td>Lec 21. Tree Recursion <br/>
(Recording)<br/>
(slides)
<a href="https://docs.google.com/presentation/d/1Gdp2PTxbO5Hu3qV1YM5yFLwc013R3hu1AJGMM3bgCfQ/edit?usp=sharing">(Slides)</a><br/>
<a href="">(Lecture Quiz)</a>
</td> <!-- Lecture -->
<td>Lab 18: Tree Recursion</td> <!-- Lab -->
<td rowspan="2">Disc 12<br/>
Expand Down
2 changes: 1 addition & 1 deletion discussion.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ This page will be updated with discussion Worksheets and Solutions throughout th
<tr>
<td>Discussion 10</td>
<td>TBD</td>
<td>Worksheet</td>
<td><a href="https://docs.google.com/document/d/1ul0g6_ExvZVpn9SI3vJYyOx2vjM773Pl/edit?usp=sharing&ouid=100628398912857125629&rtpof=true&sd=true">Worksheet</a></td>
<td>Solutions</td>
<td>Slides</td>
</tr>
Expand Down

0 comments on commit 766999f

Please sign in to comment.