[asterisk-commits] mmichelson: branch mmichelson/pubsub_bodies r406299 - /team/mmichelson/pubsub...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jan 23 15:19:58 2014
New Revision: 406299

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406299
Log:
Fix conflict before automerge fails.


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

Propchange: team/mmichelson/pubsub_bodies/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Propchange: team/mmichelson/pubsub_bodies/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 23 15:19:58 2014
@@ -1,1 +1,1 @@
-/trunk:1-406290
+/trunk:1-406298