sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-16 13:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Eduard Gert
2026-05-11 15:16:41 +02:00
parent b5a970155b
commit 439f44c6b4
13 changed files with 12 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/ui/frontend/src/pages/Debug.tsx
View File

@@ -1,11 +1,6 @@
import { useState } from "react";
<<<<<<<< HEAD:client/ui/frontend/src/screens/Debug.tsx
import { Debug as DebugSvc } from "@bindings/services";
import type { DebugBundleResult } from "@bindings/services/models.js";
========
import { Debug as DebugSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { DebugBundleResult } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Debug.tsx
import { Button } from "../components/Button";
import { Input } from "../components/Input";
import { Switch } from "../components/Switch";