Resolve merge conflicts

Browse Source

...

This commit is contained in:

Stefan Zermatten

2015-05-18 13:21:28 +02:00

parent 18286d1b9c

commit 4143929667

2 changed files with 2 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

0

rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.js Normal file