Well at 1:00 AM MST
This is what I got.
git-roxen
error: Could not read 063677f14fd73ca1ccace84ab629f3964960a955
From git://git.cuci.nl/roxen
081a4c8..888c097 5.0 -> origin/5.0
+ a5f8d24...e835622 BuGless -> origin/BuGless (forced update)
* [new branch] BuGless.mast4 -> origin/BuGless.mast4
081a4c8..888c097 master -> origin/master
Auto-merged server/base_server/prototypes.pike
Auto-merged server/base_server/roxen.pike
CONFLICT (content): Merge conflict in server/base_server/roxen.pike
Auto-merged server/base_server/roxenloader.pike
Auto-merged server/etc/modules/Roxen.pmod
Auto-merged server/modules/database/sqltag.pike
Auto-merged server/modules/tags/rxmltags.pike
Auto-merged server/protocols/http.pike
Automatic merge failed; fix conflicts and then commit the result.
It usually is something like this but reflect caudium as not being able to
read it.
Thanks,
--
Boyd Gerber <[email protected]> 801 849-0213
ZENEZ 1042 East Fort Union #135, Midvale Utah 84047
