fixed conflicts

Browse source

...

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

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

app/assets/images

ajax-loader.gif

public

favicon.ico

BIN

app/assets/images/ajax-loader.gif

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 6.7 KiB After (image error) Size: 4.1 KiB

BIN

public/favicon.ico Normal file → Executable file

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 0 B After Width: 16px  |  Height: 16px  |  Size: 1.1 KiB