[METRON-945] Resolve merge conflict in metron.spec

• Type: Bug
• Status: Done
• Priority: Major
• Resolution: Done
• Fix Version/s: 0.4.0
• Assignee: David M. Lyle
• Reporter: David M. Lyle
• Created: 09/May/17 21:13
• Updated: 10/May/17 12:45
• Resolved: 10/May/17 12:45

Description

METRON-913 mistakenly introduced a merge conflict in metron.spec. The correct behavior was to keep both.

Issue Links

• links to: GitHub Pull Request #576