sardell commented on a change in pull request #1430: METRON-2139: Refactoring
sensor-parser-config.component and wire NgRx
URL: https://github.com/apache/metron/pull/1430#discussion_r316574984
##########
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 a merge conflict still needing to be
resolved here.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
