This is a text file - and it has been changed
it will be used to test subversion checking conflicts using eclipse.
It should not be here for long.

Please ignore me.

Thanks,
Larry.

This is a text file - and it has been changed
it will be used to test subversion checking conflicts using eclipse.
It should not be here for long.

Please ignore me.

 - and this not is a conflicting changeThanks,

Larry.

Test a commit of a non-conflicting change
Test a commit of a non-conflicting change

git-svn-id: 789609e278efc0cd74c84a9bb7abaca0738de801@1028 817809c7-9d0e-0410-b92d-a7ac8b8adc13
