Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/7-add-put-restaurant' into 7-add…
…-put-restaurant # Conflicts: # backend/src/main/java/com/neuefische/team2/backend/restaurant/RestaurantController.java # backend/src/main/java/com/neuefische/team2/backend/restaurant/RestaurantService.java # backend/src/main/java/com/neuefische/team2/backend/restaurant/domain/NewRestaurantDTO.java # backend/src/main/java/com/neuefische/team2/backend/restaurant/domain/Restaurant.java # backend/src/test/java/com/neuefische/team2/backend/restaurant/RestaurantControllerIntegrationTest.java # backend/src/test/java/com/neuefische/team2/backend/restaurant/RestaurantServiceTest.java
- Loading branch information