diff --git a/test/plausible/stats/filters_test.exs b/test/plausible/stats/filters_test.exs index 156be3927..69fe6d4df 100644 --- a/test/plausible/stats/filters_test.exs +++ b/test/plausible/stats/filters_test.exs @@ -84,7 +84,6 @@ defmodule Plausible.Stats.FiltersTest do end end -<<<<<<< HEAD describe "member filter type" do test "simple member filter" do %{"page" => "/|/blog"} diff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exs index 4cfe4f983..53b9329b2 100644 --- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs @@ -408,6 +408,7 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do ] end +<<<<<<< HEAD test "can filter using the not_member filter type", %{conn: conn, site: site} do populate_stats(site, [