---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
aqq.txt;2;6
----
CategoryEmpty

---- /!\ '''Edit conflict - your version:''' ----
aqq.txt;2;6
----
CategoryEmpty

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
aqq.txt;2;6
----
CategoryEmpty

---- /!\ '''End of edit conflict''' ----