From d2686a738bb30253307f7b1f70baf06bac5d61d7 Mon Sep 17 00:00:00 2001
From: aalouane <30903736+ergo14@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:02:25 +0100
Subject: [PATCH] Fix develop semantic conflict (#7401)

---
 .../lock/impl/LegacyTimelockServiceIntegrationTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceIntegrationTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceIntegrationTest.java
index df793036d5..9f27a21bdf 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceIntegrationTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceIntegrationTest.java
@@ -20,9 +20,9 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.common.api.annotations.ReviewedRestrictedApiUsage;
 import com.palantir.atlasdb.timelock.api.TimestampLeaseName;
 import com.palantir.lock.LockClient;
-import com.palantir.lock.annotations.ReviewedRestrictedApiUsage;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimestampLeaseResult;
 import com.palantir.lock.v2.TimestampLeaseResults;