# Conflicts: # src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java # src/main/java/org/to/telegramfinalproject/UI/LoginForm.java # src/main/java/org/to/telegramfinalproject/UI/RegisterForm.java
# Conflicts: # src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java # src/main/java/org/to/telegramfinalproject/UI/LoginForm.java # src/main/java/org/to/telegramfinalproject/UI/RegisterForm.java