Differences between revisions 25 and 32 (spanning 7 versions)
|
Size: 2326
Comment:
|
Size: 1921
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 26: | Line 26: |
| *[[FLISOL2014/Brasil/SaoLuis|São Luís|target="_blank"]] | |
| Line 30: | Line 31: |
| ---- /!\ '''Edit conflict - other version:''' ---- *[[FLISOL2014/Brasil/Rondonópolis|Rondonópolis|target="_blank"]] |
*[[FLISOL2014/Brasil/Rondonópolis|Rondonópolis|target="_blank"]] |
| Line 33: | Line 33: |
| ---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- |
|
| Line 40: | Line 37: |
| *[[FLISOL2014/Brasil/Pouso Alegre|Pouso Alegre|target="_blank"]] | *[[FLISOL2014/Brasil/Paracatu|Paracatu|target="_blank"]] |
| Line 42: | Line 39: |
| ---- /!\ '''Edit conflict - other version:''' ---- | *[[FLISOL2014/Brasil/PousoAlegre|Pouso Alegre|target="_blank"]] |
| Line 45: | Line 43: |
| ---- /!\ '''Edit conflict - your version:''' ---- | |
| Line 47: | Line 44: |
| ---- /!\ '''End of edit conflict''' ---- | |
| Line 50: | Line 46: |
| *[[FLISOL2014/Brasil/Belem|Belém|target="_blank"]] | |
| Line 57: | Line 53: |
| *[[FLISOL2014/Brasil/FranciscoBeltrao|Francisco Beltrão|target="_blank"]] | |
| Line 88: | Line 85: |
| ---- /!\ '''Edit conflict - other version:''' ---- | |
| Line 91: | Line 87: |
| ---- /!\ '''Edit conflict - your version:''' ---- ---- /!\ '''End of edit conflict''' ---- ---- /!\ '''Edit conflict - other version:''' ---- |
|
| Line 98: | Line 89: |
| ---- /!\ '''Edit conflict - your version:''' ---- | *[[FLISOL2014/Brasil/Votuporanga|Votuporanga|target="_blank"]] |
| Line 100: | Line 91: |
| ---- /!\ '''End of edit conflict''' ---- | |
| Line 107: | Line 97: |
| ---- /!\ '''Edit conflict - other version:''' ---- | |
| Line 110: | Line 99: |
| ---- /!\ '''Edit conflict - your version:''' ---- CategoryCity CategoryCity CategoryCity ---- /!\ '''End of edit conflict''' ---- |
CategoryCity CategoryCity CategoryCity CategoryCity |
AC
AM
BA
CE
ES
GO
MA
MT
MS
PA
PB
PE
RN
RJ
RR
RS
SC
SE
TO