Merge remote-tracking branch 'origin/main' into confirmationDialog
# Conflicts:
#	src/Widget1.java
commit f2877f6ca1fd4b148a5b12464aed12352c7dbd4b
2 parents f9d2dae + 2ea6da8
@n-nitta n-nitta authored 7 days ago
Showing 11 changed files
View
src/BusinessCardManagement.java
View
src/CurScreen.java
View
src/Main.java
View
src/ScreenTemplate.java
View
src/ScreenTemplates.java
View
src/Search4.java 0 → 100644
View
src/Search7.java 0 → 100644
View
src/SwingPresenter.java
View
src/Widget.java
View
src/Widget1.java
View
src/Widgets1.java