[asterisk-commits] branch oej/test-this-branch r15828 - /team/oej/test-this-branch/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Mar 28 17:01:29 2006
New Revision: 15828

URL: http://svn.digium.com/view/asterisk?rev=15828&view=rev
Log:
Resolve conflict, reset automerge, go on

Modified:
    team/oej/test-this-branch/   (props changed)

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 28 17:01:29 2006
@@ -1,1 +1,1 @@
-/trunk:1-15736
+/trunk:1-15783