Merge remote-tracking branch 'origin/maint'

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 901e88a9648823ccb515828c312197c0dd894446..5a034544f5eb3ec358ebef4379e87b0fcd5b04f4 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,6 @@
 /* Find and resolve or report lookahead conflicts for bison,
-   Copyright (C) 2000, 2001, 2002, 2004, 2007, 2009 Free Software
+
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2012 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.