Removed Text from Merging

Author: ciegler

src/components/shared/Stats.tsx

@@ -40,14 +40,12 @@ const Stats = () => {
 			}
 			let filter = filterMap.find(({ name }) => name === f.name);
 			filterValue = f.value;
-<<<<<<< HEAD
 			if (!!filter) {
 				dispatch(editFilterValue({filterName: filter.name, value: filterValue, resource: "events"}));
-=======				// go to first page without reloading all events
-        			dispatch(setOffset(0));
-        			dispatch(setPageActive(0));
+				// go to first page without reloading all events
+        		dispatch(setOffset(0));
+        		dispatch(setPageActive(0));
 				dispatch(editFilterValue({ filterName: filter.name, value: filterValue, resource: "events" }));
->>>>>>> be73635d4b (Go to first page when changing filters via Stats)
 			}
 		});
 		await dispatch(fetchEvents());