Size: 249
Comment: Test myfunction comment
|
Size: 351
Comment: Test myfunction comment
|
Deletions are marked like this. | Additions are marked like this. |
Line 3: | Line 3: |
---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- |
|
Line 5: | Line 9: |
CategoryCategory | CategoryHomepage ---- /!\ '''Edit conflict - other version:''' ---- |
Line 8: | Line 14: |
Test myfunction comment ---- CategoryCategory |
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
Test myfunction comment
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict