Merge conflict resolved
authorkarolykele <karoly.kele@gmail.com>
Fri, 5 May 2023 09:08:55 +0000 (11:08 +0200)
committerkarolykele <karoly.kele@gmail.com>
Fri, 5 May 2023 09:08:55 +0000 (11:08 +0200)
commit8501304773c452fab5efbdef047beb8ab2d57a9b
tree6ef8b0d9f7bddce8926057411f6bce5bc26da39b
parentec1bfb12c590747192d29800b8182f8ca49448b4
Merge conflict resolved
lis-services/src/main/java/hu/user/lis/services/data/InvoiceServiceImpl.java
lis-services/src/main/java/hu/user/lis/services/data/PartnerService.java