conflicts resolved

[redis.git] / ae_select.c

diff --git a/ae_select.c b/ae_select.c
index 6dc825153aa3c5904d65b330db3411655d9774c7..43f5867f369f17bfa6478de713e9902375410a69 100644 (file)
--- a/ae_select.c
+++ b/ae_select.c
@@ -1,5 +1,5 @@
 /* Select()-based ae.c module
- * Copyright (C) 2009 Salvatore Sanfilippo - antirez@gmail.com
+ * Copyright (C) 2009-2010 Salvatore Sanfilippo - antirez@gmail.com
  * Released under the BSD license. See the COPYING file for more info. */
 
 #include <string.h>