Diff for "FLISOL2014/BrasilCidades"

Differences between revisions 25 and 26

-  ⇤ ← Revision 25 as of 2014-02-13 12:50:18 → 
  Size: 2326
  Editor: MarcusViniciusCirinoESilva
  Comment:
+   ← Revision 26 as of 2014-02-13 12:52:36 → ⇥
  Size: 1592
  Editor: MarcusViniciusCirinoESilva
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 30:
----- /!\ '''Edit conflict - other version:''' ----
*[[FLISOL2014/Brasil/Rondonópolis|Rondonópolis|target="_blank"]]
+ *[[FLISOL2014/Brasil/Rondonópolis|Rondonópolis|target="_blank"]]
-Line 33:
+Line 32:
----- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
-Line 42:
+Line 38:
----- /!\ '''Edit conflict - other version:''' ----
-Line 45:
+Line 40:
----- /!\ '''Edit conflict - your version:''' ----
-Line 47:
+Line 41:
----- /!\ '''End of edit conflict''' ----
-Line 88:
+Line 81:
----- /!\ '''Edit conflict - other version:''' ----
-Line 91:
+Line 83:
----- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
-Line 98:
+Line 85:
----- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
-Line 107:
+Line 91:
----- /!\ '''Edit conflict - other version:''' ----
-Line 110:
+Line 93:
----- /!\ '''Edit conflict - your version:''' ----
-Line 112:
+Line 94:
----- /!\ '''End of edit conflict''' ----

Atajos útiles