RE: [ros-dev] Re: [ros-diffs] [hbirr] 13257: - InterpretSTATUS_TIMEOUT as error in PsLockProcess.

[Casper Hornstrup]

> I had problems to commit this file. After deleting and 
> updating I've inserted the wrong code again. I will fix this.

What were the problems? Was it due to a merge conflict? If so,
it is needed to use "svn resolved" on the file to resolve the
conflicted state.

Casper