[svn-commits] mmichelson: branch group/CCSS_Monitor_Restructure r242407 - /team/group/CCSS_...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jan 22 12:28:18 2010
New Revision: 242407

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242407
Log:
Turn automerge back on.

I got notified of an automerge conflict, but for some odd reason,
I couldn't merge the conflict into my local copy to resolve it. For
now, I'm re-setting the automerge property. If I get told of another
conflict, I'll investigate further.


Modified:
    team/group/CCSS_Monitor_Restructure/   (props changed)

Propchange: team/group/CCSS_Monitor_Restructure/
------------------------------------------------------------------------------
    automerge = *