[Solar-talk] solar_auth_adapter_sql

[Andreas Ravnestad]

Jeff Surgeson wrote:
> Hi Paul
>
> I am sure you are aware of this already but if not, also I am not sure if this 
> is intentional or not.
>
> Solar_Auth_Adapter_Sql now has some funnies
>
> // get the results
> <<<<<<< .mine
> //$rows = $select->fetch('rowset');
> $rows = $select->fetch('all');
> =======
> $rows = $select->fetchAll();
>   
>>>>>>>> .r2885
>>>>>>>>                 
>
> There are also multiple versions of Solar_Auth_Adapte_Sql namely
>
> Sql.php
> Sql.php.mine
> Sql.php.r2879
> Sql.php.r2885
>
>   



Definitely looks like an SVN conflict. Try deleting the files in 
question and run svn update.

-Andreas