Re: Someone please fix
Mike Frysinger <[email protected]>
| Newsgroups | gmane.comp.mobile.bitpim.devel |
|---|---|
| Organization | wh0rd.org |
| Message-ID | <[email protected]> |
On Saturday 08 December 2007, William Hendricks wrote: > I don't know how it got commited to the SVN how about the explanation: it wasnt > but on startup I get a long > message which, when boiled down shows the following: > > \src\phones\p_lgvx8550.py", line 69 > <<<<<<< .mine you have local modifications that caused a conflict read about conflicts in the subversion manual -mike ------------------------------------------------------------------------- SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ BitPim-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bitpim-devel
signature.asc
(application/pgp-signature, 827 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) iQIVAwUAR1ss/kFjO5/oN/WBAQLDKA/+Obvesl8BNvkPkTkpJROIopclbVkuNzDy RL8utTR1JuOZDELsokEdPvxOUNZ1IONuH0nmAXXkRAaG2C3W0lsbar+jbZPDFkaD OPjLZtPj9TlGTsq5Q97Phm4PtJD+L9AIkVTLGkNnHKfVH2wgQKj4oqtDJIis06u/ eedgH+f7w6CGiU3cxA0UebMir+Q+YbvLX4vjUcWwlSnh3LydizJnPK6XsILQoSZo /UApswyeN4kSC5ExufN2WwBiDpSYXnWaHkT86AQGiXqTQpoyqEbj3uVv3ENu4trw OTiVq092MdUxfLG/8zoxldvKviE+8varq1A6xtkTieZJDe2OhYVdcZAORDj0T530 Lnk3O54t6S3qqX+hEsKXOHJtiNjfnj/MtA2U9usOONH5fGjz5on3jvpmHoWEoD62 zTIuzJmbCNT3m6UiHkaKtyrrKAn8qln01uJJOGbno+xYthvJYopu8OEChYy4kd6v imAGFDTypjHKj1A/vkTqSlDgwnTwSbPwihfFztGlxR9hSv2Wa0x9zYd7TDi9irY7 Ta789sSLQwE5z+5MeJnnVDnQbc04/Tkyt28XRfQ11iM0wNaN5jkTkF9moQA1mzAB Vc9Tv0pOxc8bcRdXWvYehOZAgKbYPug4g49Dx2zJ9GzrNklhsIwcHt/sF34t9/iM SyKwjMvftr8= =7MJf -----END PGP SIGNATURE-----