Fix merge conflict

AY2324S1-CS2103T-F11-2 · Nov 13, 2023 · 8cc0f80 · 8cc0f80
2 parents 9ab7026 + 36a9c1b
commit 8cc0f80
Show file tree

Hide file tree

Showing 18 changed files with 760 additions and 267 deletions.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
diff --git a/docs/images/tutorial/clear.png b/docs/images/tutorial/clear.png
diff --git a/docs/images/tutorial/guest-add.png b/docs/images/tutorial/guest-add.png
diff --git a/docs/images/tutorial/guest-edit.png b/docs/images/tutorial/guest-edit.png
diff --git a/docs/images/tutorial/guest-filter-0.png b/docs/images/tutorial/guest-filter-0.png
diff --git a/docs/images/tutorial/guest-filter-1.png b/docs/images/tutorial/guest-filter-1.png
diff --git a/docs/images/tutorial/guest-filter-2.png b/docs/images/tutorial/guest-filter-2.png
diff --git a/docs/images/tutorial/guest-filter-3.png b/docs/images/tutorial/guest-filter-3.png
diff --git a/docs/images/dietary-requirements-panel.png → ...-interface/dietary-requirements-panel.png b/docs/images/dietary-requirements-panel.png → ...-interface/dietary-requirements-panel.png
diff --git a/docs/images/understanding-interface/guest-card.png b/docs/images/understanding-interface/guest-card.png
diff --git a/docs/images/understanding-interface/input-output.png b/docs/images/understanding-interface/input-output.png
diff --git a/docs/images/understanding-interface/lists.png b/docs/images/understanding-interface/lists.png
diff --git a/docs/images/quick-view-panel.png → ...erstanding-interface/quick-view-panel.png b/docs/images/quick-view-panel.png → ...erstanding-interface/quick-view-panel.png
diff --git a/docs/images/rsvp-status-panel.png → ...rstanding-interface/rsvp-status-panel.png b/docs/images/rsvp-status-panel.png → ...rstanding-interface/rsvp-status-panel.png
diff --git a/docs/images/understanding-interface/ui-overview.png b/docs/images/understanding-interface/ui-overview.png
diff --git a/docs/images/understanding-interface/vendor-card.png b/docs/images/understanding-interface/vendor-card.png