wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-12 12:30:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
okbel
2018-05-02 13:28:03 -03:00
parent 72ca9b38bb
commit 6c0c76328f
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-auth/client/index.js
-2
View File
@@ -6,7 +6,6 @@ import Login from './login/containers/Main';
import reducer from './login/reducer';
import ChangePassword from './profile-settings/containers/ChangePassword';
import Profile from './profile-settings/containers/Profile';
import ChangeUsername from './profile-settings/containers/ChangeUsername';
export default {
reducer,
@@ -15,7 +14,6 @@ export default {
stream: [UserBox, SignInButton, SetUsernameDialog],
login: [Login],
profileHeader: [Profile],
profileHeader: [ChangeUsername],
profileSettings: [ChangePassword],
},
};