From 00d2767e886ce1a09a5c59ee5a555e7556e61fd6 Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Thu, 26 Aug 2021 14:15:56 -0600
Subject: [PATCH] Fix semantic merge conflict accidentally introduced (#1301)

---
 .../registry/model/replay/ReplicateToDatastoreActionTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java b/core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java
index ccb8c7c1e..8791e17e5 100644
--- a/core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java
+++ b/core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java
@@ -188,7 +188,7 @@ public class ReplicateToDatastoreActionTest {
   @Test
   void testMissingTransactions_fullTask() {
     // Write a transaction (should have a transaction id of 1).
-    TestEntity foo = new TestEntity("foo");
+    TestObject foo = TestObject.create("foo");
     jpaTm().transact(() -> jpaTm().insert(foo));
 
     // Force the last transaction id back to -1 so that we look for transaction 0.