Merge remote-tracking branch 'starskiRepo/backend'

# Conflicts: # README.md
2019-01-23 21:56:34 +01:00 · 2019-01-23 21:56:34 +01:00 · 1999d4cb12
commit 1999d4cb12
parent 48f36a188b
1 changed files with 1 additions and 0 deletions
--- a/src/main/java/com/dino/scrum/sysmag/service/ProductServiceImpl.java
+++ b/src/main/java/com/dino/scrum/sysmag/service/ProductServiceImpl.java
@ -110,6 +110,7 @@ public class ProductServiceImpl implements ProductService {
        return productRepository.findById(productToChange.getId().longValue());
    }

+
    @Override
    public long count() {
        return productRepository.count();