Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
Fix develop semantic conflict (#7401)
Browse files Browse the repository at this point in the history
  • Loading branch information
ergo14 authored Oct 25, 2024
1 parent d079677 commit d2686a7
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d2686a7

Please sign in to comment.