Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/crud-Favourite' into crud-Favourite
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/cat/udl/eps/softarch/demo/repository/FavouriteRepository.java
  • Loading branch information
Antt02 committed Mar 19, 2024
2 parents 7467bb0 + af40c7e commit 3a71038
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 3a71038

Please sign in to comment.