Fixed conflicts introduced in last merge from Vladimir
authorDrew Crampsie <drewc@tech.coop>
Wed, 29 Jun 2005 22:21:32 +0000 (15:21 -0700)
committerDrew Crampsie <drewc@tech.coop>
Wed, 29 Jun 2005 22:21:32 +0000 (15:21 -0700)
commit85281029204a031b47baa1fd1777d4c0b08d48bf
treed56ea6f21978c8d1b7ff03a7f2b3ca4ec5220778
parent12dcf3d4b06fd83b8c62c01a93dc26f94dc922ee
Fixed conflicts introduced in last merge from Vladimir

For some reason i can't seem to apply Vladimir's darcs patches (bad patch bundle).

I will sort this out eventually.

darcs-hash:20050629222132-5417e-1c3a6ec82da95571dc19e5d4b757620ef793edfb.gz
src/mewa/slot-presentations.lisp
src/packages.lisp