[asterisk-commits] mmichelson: branch mmichelson/npm_fixes r188519 - /team/mmichelson/npm_fixes/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr 15 10:06:02 2009
New Revision: 188519

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188519
Log:
Okay this is weird. I svn updated, and saw a conflict in chan_sip, and fixed it.
What's weird is that I did not get an e-mail stating that there was a conflict in this
branch, and the automerge property was still set...whiskey tango foxtrot, mate?


Modified:
    team/mmichelson/npm_fixes/   (props changed)

Propchange: team/mmichelson/npm_fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 15 10:06:02 2009
@@ -1,1 +1,1 @@
-/trunk:1-188493
+/trunk:1-183558