Unresolved merge conflict in auth_actions.js - Githubissues

kangzeroo / Kangzeroos-Complete-AWS-Web-Boilerplate-2016

21 stars 11 forks source link

Unresolved merge conflict in auth_actions.js #5

Open adonley opened 6 years ago

adonley commented 6 years ago

https://github.com/kangzeroo/Kangzeroos-Complete-AWS-Web-Boilerplate/blob/6dbd640a98f046fec2376a62b2884e394e5e73a9/Boilerplate_Frontend/App/src/actions/auth_actions.js#L36