Fix erroneous merge conflict resolution from v2.5.11

2019-04-29 14:57:28 -04:00
parent 37c2c4b4a2
commit f31d6c55be
2 changed files with 2 additions and 2 deletions
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -149,7 +149,7 @@ class TopologyMapViewSet(ModelViewSet):

 class TagViewSet(ModelViewSet):
    queryset = Tag.objects.annotate(
-        tagged_items=Count('taggit_taggeditem_items', distinct=True)
+        tagged_items=Count('extras_taggeditem_items', distinct=True)
    )
    serializer_class = serializers.TagSerializer
    filterset_class = filters.TagFilter