aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 09a6cbb2..cfb55b4c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -312,7 +312,6 @@
* gawktexi.in (Nextfile Statement): Clarify what happens in
a BEGINFILE rule.
->>>>>>> master
2020-10-31 Arnold D. Robbins <arnold@skeeve.com>