resolve merge conflict

2019-12-27 13:52:53 +05:30
parent eaa5794ec3
commit 6b59aef544
1 changed files with 3 additions and 0 deletions
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/product/ProductRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/product/ProductRepository.java
@@ -1,5 +1,8 @@
 package com.baeldung.multipledb.dao.product;

+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;

 import com.baeldung.multipledb.model.product.Product;