Am 12.04.10 15:10, schrieb Stephen Deasey: > You are going to have to merge the two heads with 'hg merge' and then > push that changeset. See: hg help merge. > many thanks! should be fine now. -gustaf
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
