Merge remote-tracking branch 'origin/master'

# Conflicts: # docs/UserGuide.md
nus-cs2103-AY2223S2 · Apr 14, 2023 · 15d24b9 · 15d24b9
2 parents 14b1139 + 44f0257
commit 15d24b9
Show file tree

Hide file tree

Showing 16 changed files with 152 additions and 60 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/images/UserGuide/SetPictureCommand1.png → docs/images/SetPictureCommand1.png b/docs/images/UserGuide/SetPictureCommand1.png → docs/images/SetPictureCommand1.png
diff --git a/docs/images/UserGuide/SetPictureCommand2.png → docs/images/SetPictureCommand2.png b/docs/images/UserGuide/SetPictureCommand2.png → docs/images/SetPictureCommand2.png
diff --git a/docs/images/UserGuide/SetPictureCommand3.png → docs/images/SetPictureCommand3.png b/docs/images/UserGuide/SetPictureCommand3.png → docs/images/SetPictureCommand3.png
diff --git a/docs/images/UserGuide/ThemeCommandDark.png → docs/images/ThemeCommandDark.png b/docs/images/UserGuide/ThemeCommandDark.png → docs/images/ThemeCommandDark.png
diff --git a/docs/images/UserGuide/ThemeCommandLight.png → docs/images/ThemeCommandLight.png b/docs/images/UserGuide/ThemeCommandLight.png → docs/images/ThemeCommandLight.png
diff --git a/docs/images/UserGuide/javajar.png b/docs/images/UserGuide/javajar.png
diff --git a/docs/images/UserGuide/editAfter.png → docs/images/editAfter.png b/docs/images/UserGuide/editAfter.png → docs/images/editAfter.png
diff --git a/docs/images/UserGuide/editBefore.png → docs/images/editBefore.png b/docs/images/UserGuide/editBefore.png → docs/images/editBefore.png
diff --git a/...es/UserGuide/batchexport/exportedFile.png → docs/images/exportedFile.png b/...es/UserGuide/batchexport/exportedFile.png → docs/images/exportedFile.png
diff --git a/...uide/batchexport/exportedFileLocation.png → docs/images/exportedFileLocation.png b/...uide/batchexport/exportedFileLocation.png → docs/images/exportedFileLocation.png
diff --git a/docs/images/UserGuide/filterInterface.png → docs/images/filterInterface.png b/docs/images/UserGuide/filterInterface.png → docs/images/filterInterface.png
diff --git a/docs/images/UserGuide/filterResults.png → docs/images/filterResults.png b/docs/images/UserGuide/filterResults.png → docs/images/filterResults.png
diff --git a/docs/images/UserGuide/findInterface.png → docs/images/findInterface.png b/docs/images/UserGuide/findInterface.png → docs/images/findInterface.png
diff --git a/docs/images/UserGuide/findResults.png → docs/images/findResults.png b/docs/images/UserGuide/findResults.png → docs/images/findResults.png
diff --git a/.../images/UserGuide/batchadd/movingFile.png → docs/images/movingFile.png b/.../images/UserGuide/batchadd/movingFile.png → docs/images/movingFile.png