Diff for "LaredoTeam"

LaredoTeam

Differences between revisions 3 and 5 (spanning 2 versions)

$Warning /!\$ Edit conflict - other version:

The Laredo Linux team from Laredo, Texas.

Add your name below: Xavier Naldo Alejandro Ramirez Roberto Santos Luis Cisneros

$Warning /!\$ Edit conflict - your version:

The Laredo Linux team from Laredo, Texas.

Add your name below: Xavier Naldo Alejandro Ramirez Roberto Santos Luis Cisneros

$Warning /!\$ End of edit conflict

LaredoTeam (last edited 2011-01-22 22:46:53 by cpe-24-170-90-122)

-  ⇤ ← Revision 3 as of 2008-08-06 16:37:19 → 
  Size: 178
  Editor: localhost
  Comment: converted to 1.6 markup
+   ← Revision 5 as of 2011-01-22 22:41:30 → ⇥
  Size: 549
  Editor: cpe-24-170-90-122
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-The LaredoTeam hails from Laredo, Texas.
+---- /!\ '''Edit conflict - other version:''' ----
The Laredo Linux team from Laredo, Texas.
-Line 3:
+Line 4:
-Our website is http://www.laredolinux.org.
+Our website is http://laredolinux.org.
-Line 5:
+Line 6:
-Add your name below (alphabetical by last name):
LoyeYoung
+Add your name below:
Xavier Naldo
Alejandro Ramirez
Roberto Santos
Luis Cisneros
-Line 9:
+Line 13:
+---- /!\ '''Edit conflict - your version:''' ----
The Laredo Linux team from Laredo, Texas. 

Our website is http://laredolinux.org. 

Add your name below:
Xavier Naldo
Alejandro Ramirez
Roberto Santos
Luis Cisneros
----
CategoryLoCoTeams

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