That one was a bit of a mess. I've fixed it all now and commit the update.
Regards, Edward On 8 September 2010 00:43, Michael Bieri <[email protected]> wrote: > > Follow-up Comment #60, task #6847 (project relax): > > Hi Edward > > There is a conflict in merging the 1.3 line to the bieri_gui line after the > command: > > svnmerge merge > > The gui_line is the latest version. > > Output: > > Summary of conflicts: > Text conflicts: 1 > > > Cheers > Michael > > > > _______________________________________________________ > > Reply to this item at: > > <http://gna.org/task/?6847> > > _______________________________________________ > Nachricht geschickt von/durch Gna! > http://gna.org/ > > > _______________________________________________ > relax (http://nmr-relax.com) > > This is the relax-devel mailing list > [email protected] > > To unsubscribe from this list, get a password > reminder, or change your subscription options, > visit the list information page at > https://mail.gna.org/listinfo/relax-devel > _______________________________________________ relax (http://nmr-relax.com) This is the relax-devel mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-devel
