[FIX #2] fixing the merge conflict

0xastro · Mar 14, 2020 · c4a159c · c4a159c
1 parent c7981c7
commit c4a159c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/orc8r/gateway/python/setup.py b/orc8r/gateway/python/setup.py
@@ -32,6 +32,7 @@
         "magma.magmad.check.network_check",
         "magma.magmad.upgrade",
         "magma.state",
+        "magma.eventd",        
     ],
     scripts=[
         "scripts/checkin_cli.py",
@@ -78,5 +79,7 @@
         # force same requests version as lte/gateway/python/setup.py
         "requests==2.22.0",
         "jsonpickle",
+        "bravado-core==5.16.1",
+        "jsonschema==3.1.0",
     ],
 )