[dev] [commits] Horde branch ingo_3_1 created. 7da0a9f68facafba37d8c5beebc3831ae3ec5829

[Jan Schneider]

Zitat von Michael M Slusarz <slusarz at horde.org>:

> The branch "ingo_3_1" has been created.
>         at  7da0a9f68facafba37d8c5beebc3831ae3ec5829 (commit)
>
> -----------------------------------------------------------------------
> commit 7da0a9f68facafba37d8c5beebc3831ae3ec5829
> Author: Michael M Slusarz <slusarz at horde.org>
> Date:   Mon Nov 12 23:44:48 2012 -0700
>
>     [mms] All Ingo templates now use Horde_View.
>
>     Conflicts:
>     	ingo/docs/CHANGES
>     	ingo/package.xml

I already created an ingo_3_1 branch locally that wasn't ready for  
origin yet. Any idea how to best merge these two into a single branch  
that tracks origin/ingo_3_1?
-- 
Jan Schneider
The Horde Project
http://www.horde.org/