fix

2025-03-16 22:01:42 +01:00
parent 331015aaf6
commit bba8297c03
1 changed files with 0 additions and 5 deletions
--- a/apps/dispatch/app/(dispatch)/_components/navbar/Navbar.tsx
+++ b/apps/dispatch/app/(dispatch)/_components/navbar/Navbar.tsx
@@ -1,11 +1,6 @@
 "use client";

 import { ToggleTalkButton } from "../ToggleTalkButton";
-<<<<<<< HEAD
-import { ChangeRufgruppe } from "../ChangeRufgruppe";
-=======
-import { Notifications } from "../Notifications";
->>>>>>> 4862f736124cb26fdc154299b855a830e1248452
 import Link from "next/link";
 import { Connection } from "../Connection";
 import { ThemeSwap } from "./_components/ThemeSwap";