zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-20 01:35:59 +02:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/test/resources/google/registry/model/schema.txt
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;
}
}