On Jun 13, 2008, at 5:15 AM, Henning Hraban Ramm wrote:
> WHO COMMITS SUCH A CRAP???
> Don't you test your code before committing?
That is a subversion conflict. Your local copy of dMenuItem was
modified in a way that svn couldn't resolve.
The code in the repository doesn't contain that (see
http://trac.dabodev.com/browser/trunk/dabo/ui/uiwx/dMenuItem.py)
.
The markings are designed to show where your change conflicted with
the version in the repository. You can look at that code, and decide
if you want to keep your version, discard your changes, or manually
integrate them.
-- Ed Leafe
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]
