fix conflict

nadbm · Apr 11, 2017 · 7817306 · 7817306
2 parents 06b6cfa + 7fc4458
commit 7817306
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ComponentCell.js b/src/ComponentCell.js
@@ -40,7 +40,7 @@ export default class ComponentCell extends PureComponent {
         rowSpan={rowSpan || 1}>
         { ((editing && !readOnly) || forceComponent) ? this.props.component : value }
       </td>
-    )
+    );
   }
 }