[
https://issues.apache.org/jira/browse/METRON-945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16004592#comment-16004592
]
ASF GitHub Bot commented on METRON-945:
---------------------------------------
Github user justinleet commented on the issue:
https://github.com/apache/incubator-metron/pull/576
+1. Made sure that the rpms built. Didn't run up full dev, but I'm good
with the changes by inspection.
> Resolve merge conflict in metron.spec
> -------------------------------------
>
> Key: METRON-945
> URL: https://issues.apache.org/jira/browse/METRON-945
> Project: Metron
> Issue Type: Bug
> Reporter: David M. Lyle
> Assignee: David M. Lyle
>
> METRON-913 mistakenly introduced a merge conflict in metron.spec. The correct
> behavior was to keep both.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
