fix merge conflict

CodeYellowBV · Mar 10, 2022 · 15e357f · 15e357f
1 parent 2c72aff
commit 15e357f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/binder/views.py b/binder/views.py
@@ -993,11 +993,7 @@ def _get_with_ids(self, pks, request, include_annotations, with_map, where_map):
 					rev_field = f.remote_field.name
 					query = (
 						view.model.objects
-<<<<<<< HEAD
-						.filter(prefix_q_expression(q, rev_field, field), **{rev_field + '__in': pks})
-=======
 						.filter(prefix_q_expression(q, rev_field, field, view.model), **{rev_field + '__in': pks})
->>>>>>> master
 						.values_list(rev_field + '__pk', 'pk')
 						.distinct()
 					)