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