From 38152535711e44624dc88a3a6545faa9298a4899 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Sat, 12 Dec 2020 19:08:57 -0500
Subject: [PATCH] Fixed a typo in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4197da5..e055e9c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-22002-4-28 Fred Gleason <fredg@wava.com>
+2002-4-28 Fred Gleason <fredg@wava.com>
 	* Initial package creation
 	* Created basic structure for Core Audio Engine (ALSA).  PW and DC
 	commands work.
@@ -20128,7 +20128,6 @@
 	"PME Mastering, Inc."
 2020-07-07 Fred Gleason <fredg@paravelsystems.com>
 	* Incremented the package version to 3.4.0int1.
-<<<<<<< HEAD
 2020-07-08 Fred Gleason <fredg@paravelsystems.com>
 	* Modified the layout of the 'Editing PodCast' dialog in
 	rdcastmanager(1) to more consistent with the event editing