From a2ab59fa18d5d54ea537e6e96ef132cc0bdde6b2 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 25 Jul 2017 22:25:38 -0400
Subject: [PATCH] spelling: conflicts

---
 ChangeLog-2012 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog-2012 b/ChangeLog-2012
index cd614e60..e859b08a 100644
--- a/ChangeLog-2012
+++ b/ChangeLog-2012
@@ -21070,7 +21070,7 @@
 
 	* src/L0.c, src/LR0.h (nstates): Be size_t.
 	Adjust comparisons (signed vs unsigned).
-	* src/conflics.c, src/lalr.c, src/lalr.h, src/output.c (LA): Now a
+	* src/conflicts.c, src/lalr.c, src/lalr.h, src/output.c (LA): Now a
 	bitset*.
 	Adjust all dependencies.