You are viewing a plain text version of this content. The canonical link for it is here.

Posted to issues@metron.apache.org by GitBox <gi...@apache.org> on 2019/08/15 14:31:13 UTC

[GitHub] [metron] sardell commented on a change in pull request #1429: METRON-2138: Code clean up (Parser aggregation)

sardell commented on a change in pull request #1429: METRON-2138: Code clean up (Parser aggregation)
URL: https://github.com/apache/metron/pull/1429#discussion_r314334710
 
 

 ##########
 File path: metron-interface/metron-config/src/app/sensors/reducers/sensors.reducers.spec.ts
 ##########
 @@ -534,7 +534,11 @@ describe('sensors: selectors', () => {
     expect(merged[1].status).toEqual(state.sensors.statuses.items[1]);
     expect(merged[2].status).toEqual(state.sensors.statuses.items[2]);
 
+<<<<<<< HEAD
 
 Review comment:
   @ruffle1986 It looks like there is still an unresolved conflict in this file.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services