tribe template merge conflict

google-code-export / django-hotclub

Automatically exported from code.google.com/p/django-hotclub

MIT License

0 stars 0 forks source link

tribe template merge conflict #23

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago

I'm not sure what happened but the tribe page (tribus in french) display that:

<<<<<<< .mine

Une tribu est un groupe de personne avec certains intérets communs.
=======

Une tribu est un groupe de personne avec certains intérets communs.
>>>>>>> .r566

Original issue reported on code.google.com by frol...@gmail.com on 15 Jul 2008 at 10:59

GoogleCodeExporter commented 9 years ago

That's something your patch in #19 contained, I removed it before committing it.

You can now savely delete the file and 'svn up' to restore it from svn.

Original comment by leidel on 15 Jul 2008 at 11:28

Changed state: Invalid

GoogleCodeExporter commented 9 years ago

Sorry I didn't noticed it, will better check that next time.

Original comment by frol...@gmail.com on 15 Jul 2008 at 4:03