mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-09 09:36:12 +00:00
Code Issues Releases Wiki Activity

Fix semantic merge conflict (#781)

Browse Source 
Note: the schema change isn't from anything I did, I think, but from an
unrelated semantic merge conflict
This commit is contained in:
gbrodman
2020-08-26 12:53:39 -04:00
committed by GitHub
parent 266bd43792
commit 0423c7ae22
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/resources/google/registry/model/schema.txt
+2 -1
View File
@@ -255,6 +255,7 @@ class google.registry.model.domain.DomainContent {
java.util.Set<google.registry.model.eppcommon.StatusValue> status;
java.util.Set<google.registry.persistence.VKey<google.registry.model.host.HostResource>> nsHosts;
java.util.Set<java.lang.String> subordinateHosts;
org.joda.time.DateTime autorenewEndTime;
org.joda.time.DateTime deletionTime;
org.joda.time.DateTime lastEppUpdateTime;
org.joda.time.DateTime lastTransferTime;
@@ -886,4 +887,4 @@ enum google.registry.model.transfer.TransferStatus {
PENDING;
SERVER_APPROVED;
SERVER_CANCELLED;
}
}