diff options
| author | nickago <ngonella@calpoly.edu> | 2015-07-13 07:23:28 -0700 |
|---|---|---|
| committer | nickago <ngonella@calpoly.edu> | 2015-07-13 07:23:45 -0700 |
| commit | b63d42c2c6256ab5e904939a83d7e3eb530e101e (patch) | |
| tree | 95a2df31e41aac20f90720608cf92d8cd0c64c67 /web/react/components/post.jsx | |
| parent | 6cc8788193630b802375669c72fab02220cb692a (diff) | |
| parent | b26bc73c7880e691e77e9ca4169e9ed7735e3bc9 (diff) | |
| download | chat-b63d42c2c6256ab5e904939a83d7e3eb530e101e.tar.gz chat-b63d42c2c6256ab5e904939a83d7e3eb530e101e.tar.bz2 chat-b63d42c2c6256ab5e904939a83d7e3eb530e101e.zip | |
merge conflicts
Diffstat (limited to 'web/react/components/post.jsx')
| -rw-r--r-- | web/react/components/post.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx index 04b5ba082..2d25e31e0 100644 --- a/web/react/components/post.jsx +++ b/web/react/components/post.jsx @@ -85,7 +85,7 @@ module.exports = React.createClass({ <div className="post__content"> <PostHeader post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} /> <PostBody post={post} sameRoot={this.props.sameRoot} parentPost={parentPost} posts={posts} handleCommentClick={this.handleCommentClick} /> - <PostInfo post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" /> + <PostInfo ref="info" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" /> </div> </div> </div> |