resolved merge conflicts

HridoyHazard · Oct 5, 2023 · 49cecde · 49cecde
1 parent d3ef1b0
commit 49cecde
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 35 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-REACT_APP_API_KEY = fba2b9a77e76827e3cb80e5c0691c0cb
+REACT_APP_API_KEY = Paste your API key here
 REACT_APP_URL = https://api.openweathermap.org/data/2.5/forecast?
 REACT_APP_ICON_URL = http://openweathermap.org/img/wn/
 

diff --git a/package-lock.json b/package-lock.json