Resolved conflict in 'ChangeLog'

This commit is contained in:
Fred Gleason
2018-09-04 17:05:12 -04:00
3 changed files with 45 additions and 35 deletions

View File

@@ -17597,6 +17597,9 @@
strings correctly.
* Modified rd_listgroups(7) in the rivwebcapi to process UTF-8
strings correctly.
2018-09-03 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'Add Next' ['PX'] RML to 'Insert Cart' ['PX'].
* Added an 'offset' parameter to the 'Insert Cart' ['PX'] RML.
2018-09-04 Fred Gleason <fredg@paravelsystems.com>
* Modified rd_listlog(7) in the rivwebcapi to process UTF-8
strings correctly.