Skip to content

Commit ca8278a

Browse files
jstacclaude
andcommitted
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]>
2 parents dd88763 + eca6a1f commit ca8278a

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

lectures/_toc.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,9 @@ parts:
7272
- file: jv
7373
- file: mccall_q
7474
- file: odu
75-
- caption: Consumption, Savings and Capital
75+
- caption: Household Problems
7676
numbered: true
7777
chapters:
78-
- file: cass_koopmans_1
79-
- file: cass_koopmans_2
80-
- file: cass_fiscal
81-
- file: cass_fiscal_2
82-
- file: ak2
8378
- file: cake_eating
8479
- file: cake_eating_numerical
8580
- file: cake_eating_stochastic
@@ -96,6 +91,14 @@ parts:
9691
- file: perm_income
9792
- file: perm_income_cons
9893
- file: lq_inventories
94+
- caption: Optimal Growth
95+
numbered: true
96+
chapters:
97+
- file: cass_koopmans_1
98+
- file: cass_koopmans_2
99+
- file: cass_fiscal
100+
- file: cass_fiscal_2
101+
- file: ak2
99102
- caption: Multiple Agent Models
100103
numbered: true
101104
chapters:
@@ -130,4 +133,4 @@ parts:
130133
chapters:
131134
- file: troubleshooting
132135
- file: zreferences
133-
- file: status
136+
- file: status

0 commit comments

Comments
 (0)