Changeset 4d78603

Timestamp:

02/05/23 18:46:45 (21 months ago)

Author:

Filip Chorbeski <86695898+FilipChorbeski@…>

Branches:

main

Children:

486054e

Parents:

e294983 (diff), 65f9c71 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve merge conflict from main

Co-Authored-By: SazdovaEkaterina <74919977+SazdovaEkaterina@…>

Location:

Prototype Application/Paw5/src/main/java/finki/paw5/repository

Files:

• .gitkeep (deleted)
• AdminRepository.java (added)
• AdopterRepository.java (added)
• AdoptionRepository.java (added)
• CategoryRepository.java (added)
• DonorDonatesToOrganisationRepository.java (added)
• DonorRepository.java (added)
• EmployeeRepository.java (added)
• FoodRepository.java (added)
• OrganisationRepository.java (added)
• PersonalProfileRepository.java (added)
• PetBelongsToCategoryRepository.java (added)
• PetNeedsInterventionInVetClinicRepository.java (added)
• PetNeedsTherapyRepository.java (added)
• PetPreferablyEatsFoodRepository.java (added)
• PetRepository.java (modified) (1 diff)
• PostRepository.java (added)
• ShelterRepository.java (added)
• SurendeeRepository.java (added)
• TherapyRepository.java (added)
• UserRepository.java (added)
• VetClinicRepository.java (added)

Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetRepository.java

@@ -5 +5 @@
 @Repository
 public interface PetRepository {
+import finki.paw5.model.entities.Pet;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PetRepository extends JpaRepository<Pet, Integer> {
 }