Merge branch 'PPD-238-call-iuv-generator' of

https://github.com/pagopa/pagopa-spontaneous-payments into PPD-238-call-iuv-generator
pagopa · Jul 14, 2022 · 38ccffd · 38ccffd
2 parents 9839934 + 9be6267
commit 38ccffd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java b/src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java
@@ -53,9 +53,6 @@ public class PaymentsService {
     private Long auxDigit; 
 
     private String iupdPrefix = "GPS" + Year.now().getValue() + "_"; 
-
-
-
 
 
     public PaymentPositionModel createSpontaneousPayment(@NotBlank String organizationFiscalCode, @Valid SpontaneousPaymentModel spontaneousPayment) {
@@ -112,7 +109,6 @@ private PaymentPositionModel createDebtPosition(String organizationFiscalCode,
     }
 
 
-
 	private PaymentOptionModel callExternalService(it.gov.pagopa.spontaneouspayment.entity.Service serviceConfiguration) {
         //TODO implement business logic
 		return new PaymentOptionModel();

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
@@ -15,7 +15,11 @@ service.aux.digit=3
 feign.client.config.default.connect-timeout=1000
 feign.client.config.default.read-timeout=1000
 
+<<<<<<< HEAD
 # Retry configuration
+=======
+# retry configuration
+>>>>>>> branch 'PPD-238-call-iuv-generator' of https://github.com/pagopa/pagopa-spontaneous-payments
 retry.gpd.maxAttempts=1
 retry.gpd.maxDelay=200
 retry.iuv.generator.maxAttempts=1