Changeset fa555ec

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:

• lib/protocols_l2.c (modified) (1 diff)

lib/protocols_l2.c

@@ -519 +519 @@
                                 case TRACE_TYPE_80211_PRISM:
                                 case TRACE_TYPE_PFLOG:
-<<<<<<< HEAD
                                 case TRACE_TYPE_ERF_META:
-=======
                                 case TRACE_TYPE_ETSILI:
->>>>>>> etsilive format is now functional (for single-threaded only).
                                         break;
                                 case TRACE_TYPE_UNKNOWN: