|
Merge remote-tracking branch 'origin/main' into confirmationDialog
# Conflicts: # src/Widget1.java |
|---|
| src/BusinessCardManagement.java |
|---|
| src/CurScreen.java |
|---|
| src/Main.java |
|---|
| src/ScreenTemplate.java |
|---|
| src/ScreenTemplates.java |
|---|
| src/Search4.java 0 → 100644 |
|---|
| src/Search7.java 0 → 100644 |
|---|
| src/SwingPresenter.java |
|---|
| src/Widget.java |
|---|
| src/Widget1.java |
|---|
| src/Widgets1.java |
|---|