Skip to content

Commit

Permalink
Merge branch 'master' into tingkai/fix-aboutus
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanljx authored Nov 7, 2022
2 parents 841f748 + f6b2452 commit a856f25
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions docs/diagrams/StorageClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ JsonUserPrefsStorage .up.|> UserPrefsStorage
JsonFoodRemStorage .up.|> FoodRemStorage
JsonFoodRemStorage ..> JsonSerializableFoodRem
JsonSerializableFoodRem --> "*" JsonAdaptedItem
JsonSerializableFoodRem --> "*" JsonAdaptedTag
JsonAdaptedItem --> "*" JsonAdaptedTag

@enduml
Binary file modified docs/images/StorageClassDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
@JsonRootName(value = "foodrem")
class JsonSerializableFoodRem {
public static final String MESSAGE_DUPLICATE_ITEMS = "Items list contains duplicate item(s).";
public static final String MESSAGE_DUPLICATE_TAGS = "Tag list contains duplicate tag(s).";

private final List<JsonAdaptedItem> items = new ArrayList<>();
private final List<JsonAdaptedTag> tagList = new ArrayList<>();
Expand Down

0 comments on commit a856f25

Please sign in to comment.