Fixed incorrect merge with master

KNMI · Aug 15, 2023 · b806cb1 · b806cb1
1 parent bb6e6a7
commit b806cb1
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,26 +1,3 @@
-<<<<<<< HEAD
-chardet
-lxml
-werkzeug
-netCDF4
-cftime
-Pillow
-uvicorn
-gunicorn
-owslib
-pyproj
-defusedxml
-pydantic==1.10.12
-fastapi
-httpx
-Jinja2
-geojson-pydantic
-cachetools
-pytz
-brotli-asgi
-Brotli
-
-=======
 #
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
@@ -141,4 +118,3 @@ uvicorn==0.23.2
  # via -r requirements.in
 werkzeug==2.3.6
  # via -r requirements.in
->>>>>>> master