Size: 600
Comment:
|
Size: 944
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 18: | Line 18: |
---- ---- |
------------------------------------------ = hello, are you feeling happy to day? = == :0) == if you: * have eaten today * have clothes on your back * a roof over your head ''you are better off than many in this world'' ------------------------------------------------ |
Line 23: | Line 38: |
Line 26: | Line 39: |
/!\ '''Edit conflict - other version:''' |
. /!\ '''Edit conflict - other version:''' |
Line 31: | Line 43: |
/!\ '''Edit conflict - your version:''' |
. /!\ '''Edit conflict - your version:''' |
Line 36: | Line 47: |
/!\ '''End of edit conflict''' |
. /!\ '''End of edit conflict''' |
Line 39: | Line 49: |
Current date is [[Date()]] |
. Current date is [[Date()]] |
Line 50: | Line 59: |
---- test test = title = [[TableOfContents([maxdepth])]] |
we all need a little space
23
fvdsaf
fdsfadsfdsafdsafdsafdsafdsafdsfadfdsafdsafdfdsafdsafdsa
- fvds
- fdsa
- fdsa
- fdsa
- 543
- 432
- 432
- *
- 432
- 543
hello, are you feeling happy to day?
:0)
if you:
* have eaten today
* have clothes on your back
* a roof over your head
you are better off than many in this world
- €
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
Current date is Date()
It's DateTime() BR
socialista
- test test