sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-20 15:49:55 +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/screens/Networks.tsx
View File

@@ -1,12 +1,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { RefreshCw } from "lucide-react";
<<<<<<<< HEAD:client/ui/frontend/src/screens/Networks.tsx
import { Networks as NetworksSvc } from "@bindings/services";
import type { Network } from "@bindings/services/models.js";
========
import { Networks as NetworksSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { Network } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Networks.tsx
import { Button } from "../components/Button";
import { Tabs } from "../components/Tabs";