clementd/3-ptits-chats - Change XEXFJLQNSY7EMBTQ4GPVTNWID42P6RWVCKDWQOGOLJPI5UDZ3RRQC

Solved conflict

Created by __maxsc__ on July 21, 2022

XEXFJLQNSY7EMBTQ4GPVTNWID42P6RWVCKDWQOGOLJPI5UDZ3RRQC

Dependencies

In channels

main

In discussions

#12 Tentative de résolution des conflits

Change contents

Resurrecting zombie bytes in 3-ptits-chats.dot at line 40 [4.126]
B:B[3.354] → [2.59:123]
BD:B[3.354] → [2.59:123]
```
"Identique" -> "Tic nerveux"
"Tic nerveux" -> "Veuve de guerre"
```
Deletion in 3-ptits-chats.dot at line 47 [4.126]
B:BD[3.576] → [2.124:124]
BD:BD[3.576] → [2.124:124]
B:BD[2.124] → [2.125:126]
BD:BD[2.124] → [2.125:126]