"whissip" development branch has been rebased (new ancestor)
Written for b2evolution by Daniel Hahler on 2009-12-07
Until recently, the "trunk" branch (CVS mirror) has been provided by myself, using tailor.
Due to bugs and problems with this, I've switched back to the VCS import feature provided by Launchpad.
Unfortunately, this meant that the ancestor of "whissip" was something completely different to "bzr" (although the contents of the files is / should be the same).
So, when merging your branch with the "rebased" whissip branch, you'll get conflicts for all files that you've changed or added in your branch.
Here's some help to get this resolved, if you need it: https:/
