> -----Original Message-----
> From: mbertens [mailto:[email protected]]
> Sent: Tuesday, May 25, 2010 10:21 AM
> To: Myles Watson
> Cc: Coreboot mailinglist
> Subject: Re: [coreboot] Patch for Nokia-IP530, now with working PIRQ table
>
> Signed-off Marc Bertens <[email protected]>
+<<<<<<< .mine
+config VENDOR_NOKIA
+ bool "Nokia"
+=======
config VENDOR_WYSE
bool "Wyse"
+>>>>>>> .r5583
This means that there was a conflict. When your patch is ready there
shouldn't be any conflicts, and it should be obvious why you're making the
changes. One thing that might help you would be to check out another copy
of coreboot and test patches on that unmodified repository.
Thanks,
Myles
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
