resolved conflicts

#690
ghostery · Jun 20, 2024 · 51cf593 · 51cf593
1 parent 4ad2a5d
commit 51cf593
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/filters/fixes.txt b/filters/fixes.txt
@@ -784,17 +784,6 @@ fussballdaten.de###spiele > div > div > div.col-md-4.content-md-4.hidden-xs > di
 ! ... type=script
 @@||poste.it/cerca-app/js/app/webtrends_service.js^$domain=poste.it
 
-! https://github.com/easylist/easylist/pull/19348
-! >>> url=https://wwwapps.ups.com/WebTracking/track?HTMLVersion=5.0&loc=en_US&Requester=UPSHome&WBPM_lid=homepage%2Fct1.html_pnl_trk&track.x=Track&trackNums=1ZGJ77070316723440
-! ... source=about:blank
-! ... type=main_frame
-@@/webtracking/*$~subdocument,domain=~wwwapps.ups.com
-! >>> url=https://wwwapps.ups.com/WebTracking/track?HTMLVersion=5.0&loc=en_US&Requester=UPSHome&WBPM_lid=homepage%2Fct1.html_pnl_trk&track.x=Track&trackNums=1ZGJ77070316723440
-! ... source=about:blank
-! ... type=main_frame
-! ... match=false
-/webtracking/*$~subdocument,~document,domain=~wwwapps.ups.com
-
 ! https://github.com/easylist/easylist/blob/7ed4f9cf77a8aab284ca703b7b9ccee909d88803/easyprivacy/easyprivacy_trackingservers_thirdparty.txt#L686
 ! https://login.eloqua.com/
 ! https://secure.p01.eloqua.com