Differences between revisions 8 and 11 (spanning 3 versions)

FLISoL Panamá 2012

Una vez más, Panamá se une al evento de Sofware Libre más importante en la región.

Ciudades Participantes

FLISOL2012/Panama/Panama - Abdel Martínez <abde.g.martinez AT SPAMFREE gmail DOT com>
FLISOL2012/Panama/Metro - PARANINFO UNIVERSITARIO (Universidad de Panamá) - Donna Roper <droper1691 AT SPAMFREE gmail DOT com>

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 8 as of 2012-02-23 00:10:58 → 
  Size: 212
  Editor: DavidNarvaez
  Comment:
+   ← Revision 11 as of 2012-03-14 12:58:15 → ⇥
  Size: 543
  Editor: Mauro Rosero
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 8:
+---- /!\ '''Edit conflict - other version:''' ----
<<Include(CategoryCities)>>

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
-Line 10:
+Line 17:
+---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

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