fixed conflict

nexlabsweb3 · Dec 1, 2024 · 60acd2d · 60acd2d
2 parents bec7e2a + bfdac4d
commit 60acd2d
Show file tree

Hide file tree

Showing 20 changed files with 1,092 additions and 50 deletions.
diff --git a/frontend/.env.example b/frontend/.env.example
@@ -4,3 +4,6 @@ RPC_URL=
 
 DATABASE_URL=
 
+BACKEND_BASE_URL=http://localhost:3000/api
+
+
diff --git a/frontend/design/branding.md b/frontend/design/branding.md
@@ -0,0 +1,3 @@
+## Brand toolkit for ScanGuard
+
+[Link to google drive](https://drive.google.com/drive/folders/1tpg9cHSTW-oZyaiq1mzFbUtVeHsVTC4d)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,6 @@ RPC_URL=

		DATABASE_URL=

		BACKEND_BASE_URL=http://localhost:3000/api
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		## Brand toolkit for ScanGuard

		[Link to google drive](https://drive.google.com/drive/folders/1tpg9cHSTW-oZyaiq1mzFbUtVeHsVTC4d)