Skip to content
Browse files

Preparing v5.16.2.01

  • Loading branch information...
1 parent 4b52f6e commit 8ffb01be812974312095858696bcf713acf9b2a8 @zipf committed Nov 10, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 tools/update_statistics.pl
View
4 tools/update_statistics.pl
@@ -85,7 +85,11 @@
$stats{$campos[0]} = [ @campos[1..8] ];
}
+<<<<<<< HEAD
keys %stats or die "ERROR: Project stats unread.\n";
+=======
+%stats or die "ERROR: Project stats unread.\n";
+>>>>>>> 19922f3cf50c1e719333154f94e9ba4a2f5f0e33
## Conexión con Google Docs ---------------------------------------------------

0 comments on commit 8ffb01b

Please sign in to comment.
Something went wrong with that request. Please try again.