Fixed merge conflict error

vikasrohit · vikasrohit · commit 55081f1f397b · 2016-10-19T09:39:15.000+05:30
diff --git a/src/components/FileList/FileListItem.jsx b/src/components/FileList/FileListItem.jsx
@@ -88,7 +88,7 @@ export default class FileListItem extends React.Component {
   }
 
   renderReadOnly() {
-    const {title, description, size, isEditable} = this.props
+    const {title, downloadUrl, description, size, isEditable} = this.props
     return (
       <div>
         <div className="title">

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export default class FileListItem extends React.Component {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`renderReadOnly() {`
`91`		`- const {title, description, size, isEditable} = this.props`
	`91`	`+ const {title, downloadUrl, description, size, isEditable} = this.props`
`92`	`92`	`return (`
`93`	`93`	`<div>`
`94`	`94`	`<div className="title">`