Fixed merge conflicts

Browse Source

...

This commit is contained in:

Elena Gvozdeva 2014-01-23 15:31:32 +04:00

parent 7bd8f9294d

commit 4d86804f11

1 changed files with 1 additions and 1 deletions

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

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