Merge branch 'master' into lugmap.linux.it

Conflicts: ToDo
Gelma · Jun 8, 2012 · 882d4a1 · 882d4a1
2 parents 95003a6 + b51ca1e
commit 882d4a1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/db/calabria.txt b/db/calabria.txt
@@ -1,5 +1,4 @@
 Catanzaro|HackLab CatanZaro|Catanzaro|http://hacklab.cz/|wzvzzb82@tznvy.pbz
-Cosenza|3byLUG 2.0 - Trebisacce Linux User Group|Trebisacce|https://www.facebook.com/groups/493543620612/|3olyht@rznvy.vg
 Cosenza|Bogomips Lug|Bisignano e dintorni|http://www.blug.it/|vasb@oyht.vg
 Cosenza|CastroLug|Castrovillari e dintorni|http://castrolug.altervista.org/|pnfgebyht@tznvy.pbz
 Cosenza|CSLug|Cosenza|http://cslug.linux.it/|vasb@pfyht.yvahk.vg

diff --git a/db/veneto.txt b/db/veneto.txt
@@ -3,7 +3,6 @@ Belluno|LugAnegA|Belluno|http://www.luganega.net/|xrafuve@yvoreb.vg
 Padova|Blah Hacklab|Este, Monselice e dintorni|http://blah.pizzahack.eu/|qwybivhm@rznvy.vg
 Padova|Faber Libertatis|Padova|http://faberlibertatis.org/|znavpura@tznvy.pbz
 Padova|FSUG Padova|Padova|http://www.fsugpadova.org/|vasb@sfhtcnqbin.bet
-Rovigo|RoLug|Rovigo|http://rovigo.linux.it/|qnyyn@yvahk.vg
 Treviso|MontelLug|Montebelluna|http://www.montellug.it/|fgrsnab.senppneb@yvoreb.vg
 Treviso|TVLug|Treviso e provincia|http://www.tvlug.it/|nyrk@giyht.vg
 Venezia|0421ug|Provincia di Venezia e Veneto orientale|http://www.0421ug.org/|vasb@0421ht.bet