Wireshark-commits: [Wireshark-commits] master bd7d074: couchbase: fix conflict

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 21 Aug 2020 03:38:35 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bd7d0742db79d5db84cdabe412484e65ed98c1d7
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

bd7d074 by Tomas Kukosa (kukosa@xxxxxxxxx):

    couchbase: fix conflict
    
    'couchbase.flex_frame_extras' exists multiple times with incompatible types: FT_STRING and FT_UINT8
    
    Change-Id: Ide607ca786e19015f4aae3cfbe85675581968267
    Reviewed-on: https://code.wireshark.org/review/38011
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  77b67c73  dcerpc: add more URLs.
     add  bd7d074   couchbase: fix conflict


Summary of changes:
 epan/dissectors/packet-couchbase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)