Attempt to avoid subversion bailing ungraciously on multiple tree con…

…flicts when I try merge.
zopefoundation · Jan 30, 2011 · 0e8eee3 · 0e8eee3
1 parent 0f4d7dc
commit 0e8eee3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/src/zope/testbrowser/tests.py → src/zope/testbrowser/tests_old.py b/src/zope/testbrowser/tests.py → src/zope/testbrowser/tests_old.py
diff --git a/src/zope/testbrowser/wsgi.py → src/zope/testbrowser/webtest.py b/src/zope/testbrowser/wsgi.py → src/zope/testbrowser/webtest.py