Merge pull request #36 from CSCDP/Fix/poetry-setup

Switched to Poetry, updated some language based on new library requirements
CSCDP · Oct 10, 2022 · b0b1c05 · b0b1c05
2 parents 0abe01e + 165e441
commit b0b1c05
Show file tree

Hide file tree

Showing 5 changed files with 633 additions and 18 deletions.
diff --git a/Reference App/API/schema/family-context-api.yaml b/Reference App/API/schema/family-context-api.yaml
@@ -106,13 +106,7 @@ paths:
           content:
             application/json:
               schema:
-<<<<<<< HEAD
-                type: array
-                items:
-                  $ref: '#/components/schemas/Person'
-=======
                 $ref: '#/components/schemas/SearchResults'
->>>>>>> upstream/master
         501:
           description: Person search is not supported by this application
     head:
@@ -130,8 +124,6 @@ paths:
         501:
           description: Person search is not supported by this application
 
-<<<<<<< HEAD
-=======
   #/api/search/person/{cmsId}:
   #  get:
   #    summary: Search for a person by cms ID
@@ -156,7 +148,6 @@ paths:
   #      404:
   #        description: Person not found
   #        content: {}
->>>>>>> upstream/master
 
   /api/person/detail/{personId}:
     get: