| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| ----- /!\ Edit conflict! Other version: ----- | |
| Line 5: | Line 4: |
|
----- /!\ Edit conflict! Your version: ----- = A Head = ----- /!\ End of edit conflict ----- |
|
| Line 11: | Line 7: |
| ----- /!\ Edit conflict! Other version: ----- | |
| Line 13: | Line 8: |
|
My image attachment:gw_widetest01.gif |
|
| Line 20: | Line 17: |
|
----- /!\ Edit conflict! Your version: ----- = Image inserted = inline:gw_widetest01.gif attachment:parcellation.jpg = After image = ----- /!\ End of edit conflict ----- |
= A Head =
HTML test
= Image inserted =
My image attachment:gw_widetest01.gif
inline:gw_widetest01.gif
attachment:parcellation.jpg
= After image =