Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/7-add-put-restaurant' into 7-add…
Browse files Browse the repository at this point in the history
…-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
gcode-de committed Jun 5, 2024
2 parents 8782207 + c80775a commit 99064e4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 99064e4

Please sign in to comment.