Differences between revisions 4 and 25 (spanning 21 versions)
|
Size: 754
Comment:
|
Size: 2326
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 7: | Line 7: |
| Line 10: | Line 9: |
| *[[FLISOL2014/Brasil/Fortaleza|Fortaleza|target="_blank"]] | |
| Line 12: | Line 12: |
| *[[FLISOL2014/Brasil/Brasilia|Brasilia|target="_blank"]] *[[FLISOL2014/Brasil/Taguatinga|Taguatinga|target="_blank"]] *[[FLISOL2014/Brasil/SantaMaria|Santa Maria|target="_blank"]] *[[FLISOL2014/Brasil/Gama|Gama|target="_blank"]] *[[FLISOL2014/Brasil/Sobradinho|Sobradinho|target="_blank"]] |
|
| Line 25: | Line 29: |
---- /!\ '''Edit conflict - other version:''' ---- *[[FLISOL2014/Brasil/Rondonópolis|Rondonópolis|target="_blank"]] ---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- |
|
| Line 29: | Line 40: |
| *[[FLISOL2014/Brasil/Pouso Alegre|Pouso Alegre|target="_blank"]] ---- /!\ '''Edit conflict - other version:''' ---- *[[FLISOL2014/Brasil/Varginha|Varginha|target="_blank"]] ---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- |
|
| Line 38: | Line 57: |
| *[[FLISOL2014/Brasil/Maringa|Maringá|target="_blank"]] | |
| Line 44: | Line 64: |
| *[[FLISOL2014/Brasil/Natal|Natal|target="_blank"]] | |
| Line 67: | Line 88: |
| ---- /!\ '''Edit conflict - other version:''' ---- *[[FLISOL2014/Brasil/SaoCarlos|São Carlos|target="_blank"]] ---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- ---- /!\ '''Edit conflict - other version:''' ---- *[[FLISOL2014/Brasil/Pederneiras|Pederneiras|target="_blank"]] ---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- |
|
| Line 71: | Line 106: |
| CategoryCity CategoryCity | ---- /!\ '''Edit conflict - other version:''' ---- CategoryCity ---- /!\ '''Edit conflict - your version:''' ---- CategoryCity CategoryCity CategoryCity ---- /!\ '''End of edit conflict''' ---- |
AC
AM
BA
CE
ES
GO
MA
MT
![/!\](/moin_static198/sol/img/alert.png "/!\"){kind=small}
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
MS
MG
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
PA
PB
PE
RN
RJ
RR
RS
SC
SE
SP
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
TO
Edit conflict - other version:
Edit conflict - your version:
CategoryCity CategoryCity CategoryCity
End of edit conflict