From 426d95394b289ddc52d2c08e05f18bcfba9cdd7d Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 2 May 2016 18:13:26 +0200 Subject: [PATCH] Fixed broken merge. Signed-off-by: Kai Zimmermann --- .../org/eclipse/hawkbit/repository/RolloutManagement.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java index 13e37abed..09decfc03 100644 --- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java +++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java @@ -59,10 +59,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.annotation.Isolation; -<<<<<<< HEAD -======= import org.springframework.transaction.annotation.Propagation; ->>>>>>> eclipse/master import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.transaction.support.TransactionTemplate; @@ -287,8 +284,8 @@ public class RolloutManagement { } } - private Rollout createRolloutGroupsInNewTransaction(final int amountOfGroups, final RolloutGroupConditions conditions, - final Rollout savedRollout) { + private Rollout createRolloutGroupsInNewTransaction(final int amountOfGroups, + final RolloutGroupConditions conditions, final Rollout savedRollout) { final DefaultTransactionDefinition def = new DefaultTransactionDefinition(); def.setName("creatingRollout"); def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);