From: Mark Beierl <mark.beierl@canonical.com>
Date: Wed, 25 Jan 2023 16:17:44 +0000 (-0500)
Subject: Up to date with master
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=82fa4429366569ec65ce88cfb37ef0fc2bb32f96;p=osm%2FLCM.git

Up to date with master

Change-Id: Iade650e01f64f7626d79183a3a91bc24e73ee234
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
---

82fa4429366569ec65ce88cfb37ef0fc2bb32f96
diff --cc requirements-dev.txt
index 39172fd,f46b9f9..2ec95c2
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@@ -35,12 -35,7 +35,7 @@@ certifi==2022.9.2
      #   requests
  cffi==1.15.1
      # via
- <<<<<<< HEAD
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
-     #   bcrypt
- =======
-     #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
- >>>>>>> fb1e25f (Fix black issues and run tox properly in stage-test)
      #   cryptography
      #   pynacl
  charset-normalizer==2.1.1