Fixes merge conflict for PR#5260

Browse source

...

This commit is contained in:

Paul Echeverri 2015-12-23 15:15:56 -08:00

parent 7a440ae26f 46c8f4f874

commit 09419b7dc4

1 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

Download patch file Download diff file Expand all files Collapse all files

BIN

docs/images/autorefresh.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 1.4 KiB