Merge pull request #395 from mattermost/merge-fix

Fix a bad merge that had edited posts being handled sloppily.

web/react/components/post_list.jsx

@@ -196,12 +196,6 @@ module.exports = React.createClass({
         if (msg.action === 'posted') {
             post = JSON.parse(msg.props.post);
             PostStore.storePost(post);
-        } else if (msg.action === 'post_edited') {
-            if (this.state.channel.id === msg.channel_id) {
-                this.setState({postList: postList});
-            }
-
-            PostStore.storePosts(post.channel_id, postList);
         } else if (msg.action === 'post_edited') {
             if (this.state.channel.id === msg.channel_id) {
                 postList = this.state.postList;