I just tried to merge in master, and got conflicts in metron.spec. Which
is not unusual since spec files are awesome.
But I was sing a head>>>>>> commit>>>>>> set of comments, that was weird.
When I look at the actual code file in github on the web, the statement is
actually in github. Like we did a commit of the conflict file
<<<<<<< HEAD
%{metron_home}/config/zeppelin/metron/metron-connection-report.json
=======
%{metron_home}/config/zeppelin/metron/metron-ip-report.json
>>>>>>> 1cace9ff29f31301d74fa6a7b2630d471452e985
So I don’t think the rpms are going to build off of this.
