219
Comment: aqq.txt;2;6
|
404
aqq.txt;2;6
|
Deletions are marked like this. | Additions are marked like this. |
Line 1: | Line 1: |
---- /!\ '''Edit conflict - other version:''' ---- |
|
Line 13: | Line 15: |
---- /!\ '''Edit conflict - your version:''' ---- aqq.txt;2;6 ---- CategoryEmpty ---- /!\ '''End of edit conflict''' ---- |
Edit conflict - other version:
Edit conflict - other version:
aqq.txt;2;6
Edit conflict - your version:
aqq.txt;2;6
End of edit conflict
Edit conflict - your version:
aqq.txt;2;6
End of edit conflict