Fix rebase mistakes

Browse Source

...

This commit is contained in:

John Furrow

2017-10-16 22:05:55 -07:00

parent fb5bac7ce1

commit a4cfd0d037

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

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

client/javascript/components/general/WindowTitle.js → client/src/javascript/components/general/WindowTitle.js

client/javascript/util/size.js → client/src/javascript/util/size.js