From acf0baf0484dda28f217a870791bae89b6f84f20 Mon Sep 17 00:00:00 2001 From: gbrodman Date: Tue, 24 Mar 2020 12:29:11 -0400 Subject: [PATCH] Fix semantic merge conflict (#528) --- .../ui/server/registrar/RegistryLockPostActionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java index bc0c3e4c5..1eb6b13c3 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java @@ -129,7 +129,7 @@ public final class RegistryLockPostActionTest { .put("relockDurationMillis", Duration.standardDays(1).getMillis()) .build(); Map response = action.handleJsonRequest(request); - assertSuccess(response, "unlock", "Marla.Singer@crr.com"); + assertSuccess(response, "unlock", "Marla.Singer.RegistryLock@crr.com"); RegistryLock savedUnlockRequest = getMostRecentRegistryLockByRepoId(domain.getRepoId()).get(); assertThat(savedUnlockRequest.getRelockDuration()) .isEqualTo(Optional.of(Duration.standardDays(1)));