|
Size: 521
Comment:
|
Size: 323
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 5: | Line 5: |
| an arrow → test | |
| Line 9: | Line 10: |
| [http://chianti.ucsd.edu/mes/basic_network.png] | |
| Line 10: | Line 12: |
|
---- /!\ '''Edit conflict - other version:''' ---- [http://chianti.ucsd.edu/mes/BASIC_NETWORK.PNG] ##[attachment:basic_network.png] |
an attachment |
| Line 14: | Line 14: |
|
---- /!\ '''Edit conflict - your version:''' ---- http://chianti.ucsd.edu/mes/BASIC_NETWORK.PNG ##[http://chianti.ucsd.edu/mes/BASIC_NETWORK.PNG] ##[attachment:basic_network.png] |
attachment:preferences_editor.png |
| Line 19: | Line 16: |
| ---- /!\ '''End of edit conflict''' ---- | [[Include(/Introduction_Introduction)]] |
This is a paragraph.
- This is a list
- still a list
Another paragraph an arrow → test
- a different kind of list
A title
A subtitle
- An image:
[http://chianti.ucsd.edu/mes/basic_network.png]
an attachment
attachment:preferences_editor.png