Gavin wrote:
> 
> No perms to write to your home dir so
> 
> /tmp/.htaccess.backup
> 
> Pretty sure the version I renamed to .htaccess will be the same as you have,
> 
> just the matter of whether we lost it being versioned properly I guess?

Thanks, got it. You are correct - same as current.
Well i don't know what the conflicts were then.
Forget it. Thanks.

-David