Changeset fa555ec for lib


Ignore:
Timestamp:
05/18/18 11:39:59 (3 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
cachetimestamps, develop, etsilive, master, rc-4.0.4, ringdecrementfix, ringperformance
Children:
a82a9e8
Parents:
25c305d
git-author:
Shane Alcock <salcock@…> (03/09/18 17:32:24)
git-committer:
Shane Alcock <salcock@…> (05/18/18 11:39:59)
Message:

Fix stupid conflict markers that crept into protocols_l2.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/protocols_l2.c

    rb663d33 rfa555ec  
    519519                                case TRACE_TYPE_80211_PRISM:
    520520                                case TRACE_TYPE_PFLOG:
    521 <<<<<<< HEAD
    522521                                case TRACE_TYPE_ERF_META:
    523 =======
    524522                                case TRACE_TYPE_ETSILI:
    525 >>>>>>> etsilive format is now functional (for single-threaded only).
    526523                                        break;
    527524                                case TRACE_TYPE_UNKNOWN:
Note: See TracChangeset for help on using the changeset viewer.