On Wed, Mar 25, 2015 at 06:49:53PM +0100, Klaus Aehlig wrote: > ...solving a semantical conflict of the merge. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > src/Ganeti/DataCollectors/Types.hs | 2 ++ > 1 file changed, 2 insertions(+)
Sorry, that patch is incomplete (sent out while having uncommitted changes). Will send out the correct patch. -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
