From e658a688c0bf095271a389d102b55375c802cfff Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Fri, 2 Aug 2019 11:59:37 +0200
Subject: [PATCH] Fix merging fail

---
 arkindex/schema.yml | 56 ++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/arkindex/schema.yml b/arkindex/schema.yml
index 7a6b164..a7700c3 100644
--- a/arkindex/schema.yml
+++ b/arkindex/schema.yml
@@ -16,7 +16,7 @@ info:
     name: Teklia
     url: https://www.teklia.com/
   title: Arkindex API
-  version: 0.9.6.dev0
+  version: 0.9.6-dev
 openapi: 3.0.2
 paths:
   /api/v1/act/{id}/:
@@ -1922,6 +1922,30 @@ paths:
         required: false
         schema:
           type: integer
+      - description: Filter elements by corpus ID.
+        in: query
+        name: corpus
+        required: false
+        schema:
+          type: string
+      - description: Only include elements that hold a given string (case-insensitive).
+        in: query
+        name: name
+        required: false
+        schema:
+          type: string
+      - description: Select the element type to look for. Defaults to 'volume'.
+        in: query
+        name: type
+        required: false
+        schema:
+          enum:
+          - volume
+          - page
+          - surface
+          - register
+          - act
+          type: string
       responses:
         '200':
           content:
@@ -2048,30 +2072,6 @@ paths:
         required: false
         schema:
           type: integer
-      - description: Filter elements by corpus ID.
-        in: query
-        name: corpus
-        required: false
-        schema:
-          type: string
-      - description: Only include elements that hold a given string (case-insensitive).
-        in: query
-        name: name
-        required: false
-        schema:
-          type: string
-      - description: Select the element type to look for. Defaults to 'volume'.
-        in: query
-        name: type
-        required: false
-        schema:
-          enum:
-          - volume
-          - page
-          - surface
-          - register
-          - act
-          type: string
       responses:
         '200':
           content:
@@ -3049,7 +3049,7 @@ paths:
       description: Retrieve an image
       operationId: RetrieveImage
       parameters:
-      - description: ''
+      - description: A UUID string identifying this image.
         in: path
         name: id
         required: true
@@ -3092,7 +3092,7 @@ paths:
       description: Update an image's status
       operationId: PartialUpdateImage
       parameters:
-      - description: ''
+      - description: A UUID string identifying this image.
         in: path
         name: id
         required: true
@@ -3146,7 +3146,7 @@ paths:
       description: Update an image's status
       operationId: UpdateImage
       parameters:
-      - description: ''
+      - description: A UUID string identifying this image.
         in: path
         name: id
         required: true
-- 
GitLab