Commit b3cdcd31 authored by Ismail Moumni's avatar Ismail Moumni
Browse files

Merge branch 'master' into '005-editing-server'

# Conflicts:
#   softwares/database/database.py
#   softwares/server/server.py
parents 5972adc7 b14cf2b0
Pipeline #1425 passed with stage
in 14 seconds
......@@ -11,7 +11,7 @@ import database as db # noqa E402
__RDOS_Dict__ = {"parameters": "request"}
# tools List
# __RDOS_Tool__ = db.list_gen()
__RDOS_Tool__ = {}
class RdosServer:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment