Markus Hoenicka <[EMAIL PROTECTED]> writes: > Hi all, > > I've just noticed that the citation support did not make it into the > 3.03 release. While this is ok with me, I'd just like to make sure > this is not my fault. I've checked in my citation patches at gna.org > to the shared branch. Please let me know if I managed to check them in > at the wrong place - something like the /dev/null equivalent of the > repository? :-)
Hi,
You put it in the right place. I just didn't have time to check it over
before the release. And the past week I took off from Emacs Lisp
development. I've now merged it into my copy. Thanks for the
contribution!
One thing to look out for before merging is conflict indicators in the
source. The looks like this:
<<<<<<< BASE
Stuff from the current repo.
=======
Stuff from the repo you're merging from.
>>>>>>> MERGE-SOURCE
Be sure to clean those up before committing. I found one of those and
cleaned it up already.
--
Michael Olson -- FSF Associate Member #652 |
http://mwolson.org/ -- Jabber: mwolson_at_hcoop.net | /` |\ | | |
Sysadmin -- Hobbies: Lisp, GP2X, HCoop | |_] | \| |_|
Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
pgpGhnPANzPFN.pgp
Description: PGP signature
_______________________________________________ Muse-el-discuss mailing list [email protected] https://mail.gna.org/listinfo/muse-el-discuss
