Fix after rebase

This commit is contained in:
smilerz
2021-11-01 12:32:19 -05:00
parent 60d7e63da8
commit 5a9543b4d8
17 changed files with 27946 additions and 679 deletions

View File

@@ -2283,24 +2283,12 @@ export interface ShoppingListRecipe {
* @memberof ShoppingListRecipe
*/
name?: string;
/**
*
* @type {FoodSupermarketCategory}
* @memberof ShoppingListEntry
*/
unit?: FoodSupermarketCategory | null;
/**
*
* @type {number}
* @memberof ShoppingListRecipe
*/
ingredient?: number | null;
/**
*
* @type {string}
* @memberof ShoppingListEntry
*/
ingredient_note?: string;
recipe?: number | null;
/**
*
* @type {number}
@@ -2353,13 +2341,7 @@ export interface ShoppingListRecipeMealplan {
/**
*
* @type {number}
* @memberof ShoppingListRecipe
*/
mealplan?: number | null;
/**
*
* @type {string}
* @memberof ShoppingListRecipe
* @memberof ShoppingListRecipeMealplan
*/
mealplan?: number | null;
/**
@@ -2408,13 +2390,7 @@ export interface ShoppingListRecipes {
/**
*
* @type {number}
* @memberof ShoppingListRecipeMealplan
*/
mealplan?: number | null;
/**
*
* @type {string}
* @memberof ShoppingListRecipeMealplan
* @memberof ShoppingListRecipes
*/
mealplan?: number | null;
/**