[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c5dd3a1fdf5469fa1dfb35cfcc948b3e2a858e7f
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

c5dd3a1 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    netflow fix conflict for hf field
    
    'cflow.transport_rtt' exists multiple times with NOT compatible types: FT_RELATIVE_TIME and FT_UINT32
    'cflow.transport_jitter_mean' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
    'cflow.transport_jitter_min' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
    'cflow.transport_jitter_max' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
    
    Change-Id: I3ee220646412235eb3bce58ce3a7bc0547a5a90d
    Reviewed-on: https://code.wireshark.org/review/20735
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Uli Heilmeier <openid@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  ff60580   udpdump: fix indent (use tab)
    adds  c5dd3a1   netflow fix conflict for hf field


Summary of changes:
 epan/dissectors/packet-netflow.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)