summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_body.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-12 15:25:41 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-12 15:25:41 -0500
commita2679ebf91e33d69df5e394a3ea1046e163ab372 (patch)
tree40e0d1cea917cfc0f95b286781fffe227ce70664 /web/react/components/post_body.jsx
parentf8a4238cc454f6f65fe1bdb552685a99737cdad6 (diff)
downloadchat-a2679ebf91e33d69df5e394a3ea1046e163ab372.tar.gz
chat-a2679ebf91e33d69df5e394a3ea1046e163ab372.tar.bz2
chat-a2679ebf91e33d69df5e394a3ea1046e163ab372.zip
Fixing bad merge
Diffstat (limited to 'web/react/components/post_body.jsx')
-rw-r--r--web/react/components/post_body.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 1e08a0661..617b4b36c 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -31,7 +31,7 @@ export default class PostBody extends React.Component {
this.state = {
links: linkData.links,
message: linkData.text,
- post: this.props.post
+ post: this.props.post,
hasUserProfiles: profiles && Object.keys(profiles).length > 1
};
}