From 6b59aef54488a9d953a112731b6c8e91a702f4f5 Mon Sep 17 00:00:00 2001 From: "amit.pandey" Date: Fri, 27 Dec 2019 13:52:53 +0530 Subject: [PATCH] resolve merge conflict --- .../com/baeldung/multipledb/dao/product/ProductRepository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git 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 index 92fd47cb34..f1256e2c72 100755 --- 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;