Resolves three conflicts: - app/api/routes.py: fixed saved_recipes-before-recipes ordering from main; meal_plans and community_router from feature branch - app/db/store.py: meal plan/prep session methods (feature) + community pseudonym methods (main) -- both additive - app/tiers.py: KIWI_BYOK_UNLOCKABLE includes meal_plan_llm, meal_plan_llm_timing (feature) and community_fork_adapt (main) |
||
|---|---|---|
| .. | ||
| assets | ||
| components | ||
| composables | ||
| services | ||
| stores | ||
| App.vue | ||
| main.ts | ||
| style.css | ||
| theme.css | ||