zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-12 05:58:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix semantic merge conflict in Registry (#810)

Browse source 
* Fix semantic merge conflict in Registry
This commit is contained in:
gbrodman 2020-09-18 14:40:11 -04:00 • committed by GitHub
parent 1a63d50b82
commit 798879d031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/google/registry/model/registry/Registry.java
View file

@ -480,6 +480,14 @@ public class Registry extends ImmutableObject implements Buildable {
Money serverStatusChangeBillingCost = DEFAULT_SERVER_STATUS_CHANGE_BILLING_COST;
/** The one-time billing cost for a registry lock/unlock action initiated by a registrar. */
@AttributeOverrides({
@AttributeOverride(
name = "money.amount",
column = @Column(name = "registry_lock_or_unlock_cost_amount")),
@AttributeOverride(
name = "money.currency",
column = @Column(name = "registry_lock_or_unlock_cost_currency"))
})
Money registryLockOrUnlockBillingCost = DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST;
/**