Differences between revisions 3 and 4
|
Size: 318
Comment:
|
Size: 619
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| ---- /!\ '''Edit conflict - other version:''' ---- | |
| Line 14: | Line 15: |
---- /!\ '''Edit conflict - your version:''' ---- '''Flisol 2011 Cartagena- Colombia''' Grupo organizador: SLCaribe '''Flisol 2011 Cartagena- Colombia''' '''Grupo organizador:''' SLCaribe ---- /!\ '''End of edit conflict''' ---- |
![/!\](/moin_static198/sol/img/alert.png "/!\"){kind=small}
Edit conflict - other version:
Edit conflict - other version:
Flisol 2011 Cartagena- Colombia
Grupo organizador: SLCaribe
Edit conflict - your version:
Flisol 2011 Cartagena- Colombia Grupo organizador: SLCaribe
End of edit conflict
Edit conflict - your version:
Flisol 2011 Cartagena- Colombia
Grupo organizador: SLCaribe
Flisol 2011 Cartagena- Colombia Grupo organizador: SLCaribe
End of edit conflict