Fixed line endings: Use "-x --ignore-eol-style" during merges to avoid.

Browse Source

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

...

This commit is contained in:

Derek Hulley

2009-03-10 19:18:39 +00:00

parent 862e3b671f

commit b30c8f915b

2 changed files with 1238 additions and 1238 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1584

source/java/org/alfresco/repo/security/person/PersonServiceImpl.java

File diff suppressed because it is too large Load Diff