Commit ca8278a
Merge main into cake eating refactor PR
Resolved conflict in _toc.yml by:
- Accepting the new "Optimal Growth" section from main
- Using renamed file "cake_eating" instead of "cake_eating_problem"
- Keeping Household Problems section with only cake eating lectures
The main branch had moved Cass-Koopmans lectures to a separate "Optimal Growth" section, which is preserved in this merge.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <[email protected]>1 file changed
+10
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
| 75 | + | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | 78 | | |
84 | 79 | | |
85 | 80 | | |
| |||
96 | 91 | | |
97 | 92 | | |
98 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
99 | 102 | | |
100 | 103 | | |
101 | 104 | | |
| |||
130 | 133 | | |
131 | 134 | | |
132 | 135 | | |
133 | | - | |
| 136 | + | |
0 commit comments