Fixup

OCamlPro · Feb 14, 2025 · 285117a · 285117a
1 parent a47b986
commit 285117a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 2,451 deletions.
diff --git a/config/ChangeLog b/config/ChangeLog
@@ -856,13 +856,7 @@
 	* default.inc, Makefile.am: New files.
 
 
-<<<<<<< .working
 Copyright 2003,2005-2007-2010,2014-2025 Free Software Foundation, Inc.
-||||||| .merge-left.r5240
-Copyright 2003,2005-2007-2010,2014-2023 Free Software Foundation, Inc.
-=======
-Copyright 2003,2005-2007-2010,2014-2024 Free Software Foundation, Inc.
->>>>>>> .merge-right.r5241
 
 Copying and distribution of this file, with or without modification, are
 permitted provided the copyright notice and this notice are preserved.