Merge remote-tracking branch 'origin/deleting_entities' into deleting_entities
# Conflicts: # core/src/main/java/cz/muni/fi/pa165/core/house/HouseFacade.java # core/src/main/java/cz/muni/fi/pa165/core/metrics/MetricsFacade.java # core/src/main/java/cz/muni/fi/pa165/core/user/UserFacade.java # core/src/test/java/cz/muni/fi/pa165/core/user/UserControllerTest.java
Please register or sign in to comment