Graham Bloice wrote: > Whoever last committed the file had an unresolved conflict.
...or Gisle does. There aren't any conflict markers in the checked-in version. _______________________________________________ Wireshark-dev mailing list [email protected] http://www.wireshark.org/mailman/listinfo/wireshark-dev
