search

liuyang1520 / django-command-extensions

Automatically exported from code.google.com/p/django-command-extensions
MIT License
0 stars 0 forks source link

a merge confilct file was checked in #98

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
http://code.google.com/p/django-command-extensions/source/browse/trunk/django_ex
tensions/management/commands/sync_media_s3.py

was checked in with unresolved merge conflict markers in the file.

Original issue reported on code.google.com by iamtoola...@googlemail.com on 17 Apr 2009 at 8:07

GoogleCodeExporter commented 8 years ago 
Okey i see, thanks for the report !

Everybody should use either the released versions or the github repository now 
we
moved from svn to git.

I'll update the svn version so it's in a not-broken-state.

But please don't use the svn repository here anymore, as it will most likely be
removed in the near future. see discussion here
http://groups.google.com/group/django-extensions/browse_thread/thread/d178fd18aa
311929

Original comment by v.oostv...@gmail.com on 18 Apr 2009 at 6:02

GoogleCodeExporter commented 8 years ago 
I noticed it when installing pinax.
I got the pinax buildout.cfg from their guthub repository and they are till 
using the
svn rep.

Original comment by iamtoola...@googlemail.com on 18 Apr 2009 at 8:01