Hello there,
I've been trying to pull the changes using ./g pull -r and got this
output. Seems there are conflicts in sw module. I guess it is because
of the patch I submitted earlier. Have a look at the output here
http://pastebin.com/zdtYtuir
And this is the output of git diff in sw module
On Wed, 2011-05-11 at 11:29 +0530, Anurag Jain wrote:
Hello there,
I've been trying to pull the changes using ./g pull -r and got this
output. Seems there are conflicts in sw module. I guess it is because
of the patch I submitted earlier. Have a look at the output here
