Projext/.plastic/plastic.mergeprogress

18 lines
739 B
Plaintext

Target: mount:56e62dd7-241f-41e9-8c6b-dd4ca4513e62#My project/My project@14569616159046@cloud merged from: Merge 9
Directory conflict: EvilTwin 22550 -11
Directory conflict: EvilTwin 22551 -12
Directory conflict: EvilTwin 22566 -27
Directory conflict: EvilTwin 22567 -28
Directory conflict: EvilTwin 22554 -33
Directory conflict: EvilTwin 22555 -34
Directory conflict: EvilTwin 22556 -17
Directory conflict: EvilTwin 22558 -18
Directory conflict: EvilTwin 22574 -31
Directory conflict: EvilTwin 22575 -32
Directory conflict: EvilTwin 22576 -29
Directory conflict: EvilTwin 22577 -30
Directory conflict: EvilTwin 22578 -13
Directory conflict: EvilTwin 22579 -14
Directory conflict: EvilTwin 22580 -25
Directory conflict: EvilTwin 22581 -26