← Back to team overview

opencompute-developers team mailing list archive

Thread
Date

Re: [Merge] lp:~sophia-wu/opencompute/add-ocp-system-event-log-job into lp:opencompute/checkbox

To: Sophia Wu <Sophia.Wu@xxxxxxxxxxx>
From: Jeff Lane <jeffrey.lane@xxxxxxxxxxxxx>
Date: Wed, 26 Mar 2014 15:34:07 -0000
In-reply-to: <20140214095529.8743.71819.launchpad@ackee.canonical.com>
Reply-to: mp+206373@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Attempt to merge into lp:opencompute/checkbox failed due to conflicts: 

duplicate in debian/changelog.moved
text conflict in jobs/local.txt.in
-- 
https://code.launchpad.net/~sophia-wu/opencompute/add-ocp-system-event-log-job/+merge/206373
Your team Open Compute Developers is subscribed to branch lp:opencompute/checkbox.

References

[Merge] lp:~sophia-wu/opencompute/add-ocp-system-event-log-job into lp:opencompute/checkbox
From: Sophia Wu, 2014-02-14