diff options
author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-29 17:00:41 +0530 |
---|---|---|
committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-29 17:00:41 +0530 |
commit | 9c0a250fd412c46861f72d8bb7cc5535b101c0fa (patch) | |
tree | ff24809b94f06b3fb12ce47dbd94e14cdc615baa /src/fields/ObjectField.ts | |
parent | 6ad7fac6342204bc489ef49cb3ba8f450bfa3824 (diff) | |
parent | 29f9cedd937697c56ce3b400931b26c82a23721d (diff) |
merge conflicts resolved
Diffstat (limited to 'src/fields/ObjectField.ts')
-rw-r--r-- | src/fields/ObjectField.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fields/ObjectField.ts b/src/fields/ObjectField.ts index 9aa1c9b04..92b2cfa60 100644 --- a/src/fields/ObjectField.ts +++ b/src/fields/ObjectField.ts @@ -3,8 +3,8 @@ import { OnUpdate, Parent, Copy, ToScriptString, ToString } from "./FieldSymbols import { Scripting } from "../client/util/Scripting"; export abstract class ObjectField { - protected [OnUpdate](diff?: any) { } - private [Parent]?: RefField | ObjectField; + public [OnUpdate](diff?: any) { } + public [Parent]?: RefField | ObjectField; abstract [Copy](): ObjectField; abstract [ToScriptString](): string; |