Fix conflict

Browse Source

...

This commit is contained in:

Carla Iriberri

2016-02-10 20:00:48 +01:00

parent d4a2184ce0 42d0812383

commit d0f7ac4d49

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

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