Avoiding merge conflicts (I'm sure there is a way to handle these in this client, maybe not yet...)

Browse Source

...

This commit is contained in:

Mr.doob

2010-11-04 20:55:58 +00:00

parent 8d198002d1

commit 047f190d4d

2 changed files with 4 additions and 4 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

build/Three.js

+2 -2

File diff suppressed because one or more lines are too long

build/ThreeDebug.js

+2 -2

File diff suppressed because one or more lines are too long