Fix login-frontend merge conflicts

Browse Source

...

This commit is contained in:

Clayton Wilson

2019-10-11 17:46:38 -04:00

parent f4b44c9654 c241455c4b

commit b337277aa4

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

twistter-frontend/src/pages/edit.js → twistter-frontend/src/pages/editProfile.js