conflict resolution (#77)

This commit is contained in:
Keagan McClelland
2021-11-23 15:55:45 -07:00
parent 158f0cbec7
commit eb7b777cf0
2 changed files with 44 additions and 14 deletions

View File

@@ -79,4 +79,16 @@ EosHash
version Version
hash Text
UniqueVersion version
ErrorLogRecord
createdAt UTCTime
epoch Word64
commitHash Text
sourceFile Text
line Word32
target Text
level Text
message Text
incidents Word32
UniqueLogRecord epoch commitHash sourceFile line target level message
|]