From c8bcdff72da4ce3f5518fe1b414bbfc34c1e9026 Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Mon, 6 Jul 2020 02:10:52 -0400
Subject: [PATCH] merge conflict

---
 netbox/extras/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 578975ed3..9d49988e7 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -1,7 +1,7 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
-from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
+from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ToggleColumn
 from .models import ConfigContext, ObjectChange, Tag, TaggedItem
 
 TAGGED_ITEM = """