From 7425f9b400cbcf624d0d43eb577b32438c3d4cc0 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Tue, 7 Apr 2020 16:23:04 +0200
Subject: [PATCH] Fix merge

---
 public/app/plugins/panel/table2/TablePanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/table2/TablePanel.tsx b/public/app/plugins/panel/table2/TablePanel.tsx
index a30bc755733..74d6bd21686 100644
--- a/public/app/plugins/panel/table2/TablePanel.tsx
+++ b/public/app/plugins/panel/table2/TablePanel.tsx
@@ -21,7 +21,7 @@ export class TablePanel extends Component<Props> {
 
     overrides.push({
       matcher: { id: matcherId, options: field.name },
-      properties: [{ isCustom: true, id: prop, value: width }],
+      properties: [{ id: prop, value: width }],
     });
 
     this.props.onFieldConfigChange({