Changeset 486054e

Timestamp:

02/05/23 18:47:31 (21 months ago)

Author:

Filip Chorbeski <86695898+FilipChorbeski@…>

Branches:

main

Children:

8a0b460

Parents:

4d78603

Message:

resolve merge conflict

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

File:

• Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetRepository.java (modified) (1 diff)

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

@@ -3 +3 @@
 import org.springframework.stereotype.Repository;
 
-@Repository
-public interface PetRepository {
 import finki.paw5.model.entities.Pet;
 import org.springframework.data.jpa.repository.JpaRepository;