Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (7e5cb132ff0a05aa347f31abedb386607f8b37 0f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <lynx AT mages.ath.cx>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (7e5cb132ff0a05aa347f31abedb386607f8b37 0f)
  • Date: Mon, 12 Mar 2007 15:25:39 +0100

On Monday 12 of March 2007 14:21:43 Andraž 'ruskie' Levstik wrote:
> On 13:47:33 2007-03-12 Jaka Kranjc <lynx AT mages.ath.cx> wrote:
> > On Monday 12 of March 2007 10:35:16 Andraž Levstik wrote:
> > > --- a/ChangeLog
> > > +++ b/ChangeLog
> > > @@ -1,3 +1,6 @@
> > > +2007-03-12 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> > > + * security/rsbac-admin: new spell, rsbac-admin tools
> > > +
> > > 2007-03-10 David Kowis <dkowis AT shlrm.org>
> > > * perl-cpan/template-plugin-gd-image: new spell, Needed for
> > > bugzilla to
> > > do charting
> > > @@ -29,6 +32,7 @@
> > > 2007-03-06 Thomas Orgis <sobukus AT sourcemage.org>
> > > * science/tisean: new spell; time series analysis toolkit
> > >
> > > +>>>>>>> origin
> >
> > incomplete merge ^
>
> incomplete merge or just a bad fixup of conflicts?
That's what I meant. Your after-conflict hand-merge was incomplete.

--
We cannot command nature except by obeying her. --Sir Francis Bacon
Have a sourcerous day! www.sourcemage.org

Attachment: pgptGpaVyJt8e.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page