Skip to content

Commit 33f0c88

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # src/main/java/use_cases/app_screen_use_case/AppScreenController.java # src/main/java/use_cases/app_screen_use_case/ChatName.java
2 parents d4cd4b3 + 1c23b28 commit 33f0c88

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

src/main/java/interface_adapters/app_screen_interface_adapters/UserAppScreenGateway.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import entities.chat.Chat;
66
import interface_adapters.*;
7-
import entities.*;
87
import data_access.UserDatabase;
98
import interface_adapters.login_interface_adapters.Login;
109

src/main/java/screens/app_screen/AppScreen.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import use_cases.app_screen_use_case.AppScreenPresenter;
88
import use_cases.app_screen_use_case.ChatName;
99
import use_cases.app_screen_use_case.Refresh;
10-
import entities.*;
1110

1211
import javax.swing.*;
1312
import java.awt.*;

0 commit comments

Comments
 (0)