fixed conflicts

This commit is contained in:
Dmitriy Zaporozhets 2011-11-06 21:12:23 +02:00
parent b8ca1d62c4
commit 121f6d04fa
2 changed files with 0 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
public/favicon.ico Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 0 B

After

Width:  |  Height:  |  Size: 1.1 KiB