diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
| commit | 6e60768abe6f0caa639febf068d718d62881ce62 (patch) | |
| tree | 0600c72a7a9a3f7c1df167b3f870b38863e9a564 /web/react/pages | |
| parent | e22e7b8b7b66f342c2df693bbfc06a85980d253e (diff) | |
| parent | ac7918c5540900ab0dbe43d61b8c1155e4279b55 (diff) | |
| download | chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.gz chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.bz2 chat-6e60768abe6f0caa639febf068d718d62881ce62.zip | |
Fixing merge conflict
Diffstat (limited to 'web/react/pages')
| -rw-r--r-- | web/react/pages/channel.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 43493de45..d24fe0b98 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -19,7 +19,7 @@ var DeletePostModal = require('../components/delete_post_modal.jsx'); var MoreChannelsModal = require('../components/more_channels.jsx'); var PostDeletedModal = require('../components/post_deleted_modal.jsx'); var ChannelNotificationsModal = require('../components/channel_notifications.jsx'); -var UserSettingsModal = require('../components/user_settings_modal.jsx'); +var UserSettingsModal = require('../components/user_settings/user_settings_modal.jsx'); var TeamSettingsModal = require('../components/team_settings_modal.jsx'); var ChannelMembersModal = require('../components/channel_members.jsx'); var ChannelInviteModal = require('../components/channel_invite_modal.jsx'); |