From 76a7ec825d60ffde2a9264bab9f2b1a873f0514a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 27 Apr 2020 08:06:02 -0400 Subject: [PATCH] Fixed typo in 'ChangeLog' Signed-off-by: Fred Gleason --- ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dca66d15..0474ab5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19245,7 +19245,6 @@ * Added an rdsoftkeys(1) man page. 2019-10-31 Fred Gleason * Incremented the package version to 3.2.0. -<<<<<<< HEAD 2019-11-20 Fred Gleason * Added interlocks to the 'Edit Switcher' and 'Edit Serial Ports' dialogs in rdadmin(1) to prohibit use of a disabled serial device. @@ -19749,7 +19748,6 @@ * Fixed a regression in rdairplay(1) that caused two events to be started by a single spacebar tap if a SoundPanel event had been played previously. -<<<<<<< HEAD 2020-04-08 Fred Gleason * Fixed a bug in rdlogmanager(1) that caused the initial event in an imported set to fail receive the proper time and transition