|
Size: 42
Comment: doors.txt;10;15
|
Size: 235
Comment: doors.txt;10;15
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
---- /!\ '''Edit conflict - other version:''' ---- |
|
| Line 4: | Line 6: |
---- /!\ '''Edit conflict - your version:''' ---- doors.txt;10;15 ---- CategoryPyCon2010 ---- /!\ '''End of edit conflict''' ---- |
![/!\](/wiki/europython/img/alert.png "/!\"){kind=small}
Edit conflict - other version:
doors.txt;10;15
Edit conflict - your version:
doors.txt;10;15
End of edit conflict