Paul De Audney wrote:
> Hi List,
>
> I have just attempted to rebuild the SRPMs for cobbler to test it out.
> There appears to be some source control conflict resolution issue in the
> code.
>
>   
Paul,

It appears that there was a failed merge included in this build 
effecting a number of files. (see my previous patch).

Michael replied to say that he would look at this tomorrow (today is a 
holiday in the US) and suggested holding off on 1.2 until he had looked 
at the problem.

Hope this helps.

Dave Hatton


_______________________________________________
cobbler mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/cobbler

Reply via email to