[Soc-2010-dev] status update request

[Nathan Letwory]

On 05/18/2010 05:29 PM, Jason Wilkins wrote:
> There were conflicts several files, I chose to take the file from the
> repository since I had not made any changes.

That is a correct way to solve such conflicts.

/Nathan

>
> On Tue, May 18, 2010 at 6:54 AM, Martin Poirier<theeth at yahoo.com>  wrote:
>
>>
>>
>> --- On *Tue, 5/18/10, Jason Wilkins<jason.a.wilkins at gmail.com>* wrote:
>>
>> 4) Have you successfully synched your branch with head?
>>>
>>
>> Yes, but there were some warnings.  Not sure if I should be worried.
>>
>> What kind of warnings?
>>
>> Martin