zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-30 22:46:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix semantic merge conflict accidentally introduced (#1301)

Browse source
This commit is contained in:
gbrodman 2021-08-26 14:15:56 -06:00 • committed by GitHub
parent d57597f40f
commit ae911a5280
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java
View file

@ -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.