Wireshark-commits: [Wireshark-commits] master bb5d031: Fix merge cruft from release-notes.adoc

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 10 Aug 2020 04:52:34 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bb5d0317d6617b196e3ee48fa6ed29551adecba3
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

bb5d031 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Fix merge cruft from release-notes.adoc
    
    Change-Id: Id33135d82f30f0d88910b994492b4a64ac170d84
    Reviewed-on: https://code.wireshark.org/review/38105
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  414255f   DHCPv6: fix for bogus errors. Detailed error msgs
     add  bb5d031   Fix merge cruft from release-notes.adoc


Summary of changes:
 docbook/release-notes.adoc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)