Fixes conflicts

Browse Source

...

This commit is contained in:

Javier Arce

2016-01-22 11:58:46 +01:00

parent 890e3b76a8 7944b4aaa6

commit 1a8e5ff3bd

6 changed files with 27 additions and 3 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

BIN

src/fonts/cartoIcon.eot

Binary file not shown.

BIN

src/fonts/cartoIcon.ttf

Binary file not shown.

BIN

src/fonts/cartoIcon.woff

Binary file not shown.