From 6c0c76328f8bf0f977b6681f6bba3e9fbb19198c Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 2 May 2018 13:28:03 -0300
Subject: [PATCH] merge conflict

---
 plugins/talk-plugin-auth/client/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/talk-plugin-auth/client/index.js b/plugins/talk-plugin-auth/client/index.js
index aa591dd68..6341dc7c9 100644
--- a/plugins/talk-plugin-auth/client/index.js
+++ b/plugins/talk-plugin-auth/client/index.js
@@ -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],
   },
 };