Sign in
vanadium
/
roadmap.go.syncbase
/
3275b4809a4fac838c6f6e8a7cb1973bd91ca2e7
/
.
/
x
/
ref
/
services
/
syncbase
/
sync
/
testdata
/
remote-noconf-link-repeat.log.sync
blob: 82e11c651cdae2047641228cb5b81778a3b1da2d [
file
] [
log
] [
blame
]
# Resolve the same conflict on two different devices.
# The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec>|<txid>|<txcount>|<deleted>
linkr
|
1234
|
3
|
4
||
VeyronLaptop
:
10
:
1
:
0
