steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: resolve merge conflicts

Browse source
This commit is contained in:
Natalia Cholewa 2026-01-18 16:28:47 +01:00
commit 61ad8a1ea9
10 changed files with 151 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/client/UI.java
View file

@ -2,7 +2,7 @@ package client;
import client.scenes.FoodpalApplicationCtrl;
import client.scenes.MainCtrl;
import client.utils.ServerUtils;
import client.utils.server.ServerUtils;
import com.google.inject.Injector;
import javafx.application.Application;
import javafx.scene.image.Image;