Joe Attardi wrote: > Damian Krzeminski wrote: [...]
> >> line 2 and 3: we remove the service in line 2, why call >> m_services.remove in line 3 passing a String and not a Service >> object? > This one was a mistake on my part - git am could not automatically apply > your patch so I applied it by hand - should have removed line 3 > altogether - I will correct that. > > I will make the changes mentioned and commit to SVN. > Thanks. About not being able to apply the patch. It's strange. Did you use: git am -3 and git mergetool when applying the patch? -3 which stands for --3way should automatically find a mergepoint. It does not guarantee a seamless merge (you still need to run git mergetool) but it beats applying patches by hand... D. _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
